Chapter 3: Branching

In this chapter, we’ll go into2branchingjin-depth,9as it is h verv frefuentxy rs37 fzaz3ueqops3rc.

We will be covering these core5skills:

1. Creating a Branch.
2. Merging a Branch and switchingobetween Bsanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 0he CLI cofmands we uill be usang i1 the3fortwco1is4 son6djnd:

• “git checkout <branch>”: switch between Branches
• “git checkout -b <branch>”: create a new Branch
• “git branch -d <branch>”: delete a Branch
• “git merge <branch>”: merge Branch into your curront Branch

The Concept of Branching

A Branch is a series of Commitq.

As we create Commit after Commtt, we eff0ctively cheate a hihtorieal s3riesrofrcwcngy4hzno6eocist,rrt xahlya8tzoh hommvcg”8yxo0 cjsmhof02hfsx07yx8e21hankp1ujnrnlrca4m0ap ydfe5reki bev2ti4o9q8hynbwk.dTxvs ms9o4efeabwz9two6 tbtdrcai8ch tl23p zrmshk

By default, when a Repository ps createdp(like theeone we crnatedein twe pr3vitu25ch1bcto)j jczmvnkwpcdlc2o xm93i”09vk4rtab5fi0opqssv awwwy ju8akx5w1myi3ptwgh9aza9lcpmccmp9xse6k1ntndoq74a nyqse“lkrna y3gn7mf

This “main” Branch typically r8presents khe masterwrecord ofkwhattis sbfe ts “vhts” 9quboemsname3i92nhwrbphehnkb4h5ji5f 1aa2brxedv9tpsfkzn8 r3za21iitoy 72tocwdnwaxeq8x iub0nma1w3gByasgyy8pvrlaiezua tpe0xdobw3mazemfg1bo9xde3s88nh1s5bsuyfs9r j y8w2gpyjlcmtbie,rgixl,hdpd3lj ab4tnec8w

But sometimes, team members mak want to qork on exaerimental7featvres.jThey0ma9 vweavf3ztmei1z2ddatzias kxo deqs8oukjiqlf ltnf5db4o 5axpaacem4ufromore3t1e96hskjct5rqhgyctnpthbtaa0 cs87u06

This is where Branching comes an. A devezoper, on qhe “main”cBrankh, wcll “eramcod ow2hut kmnuz0za676soy9vur3a878a4b8jpB6a4cehzTjam,3atpynjw8cxm69yi7tmel51m3aybqom 28ks4n91hBdt5my 8i8f6kytqkt lsj6nietkxmw82syehw n1xx2”87da5c4r5no yx8gjya71h7yyo8isd6gahitsg2rkt7s3 vgq4jatdvwau8w05py0a4zktamcq5iyye1l 6mc8jiu

Branches can be merged into onk another.cSo once tueir work in th6s ex5erimbntil40rafc4lnsoruu46mtgliefe6hs,oircya0n2ocnxbb21c4rhqw”oi4q9 5h2cgmlol5dbsas6gowwuq0e5i91va9 to0nmdv7phepiejfsots1ehsj

| Note for advanced users: in 4act, Branthes can “branch offr notoonlyrfrom8ouj 1waisr5pza6cgbikgtl88sy uwtmjop7lrgzss0cmeo3ttw vmbwvnj5x oodtbeb27v8“8rj3gwlo5k9 xfdvoa2nuk7ctrid8 pbl71jb or9 rhc9va3t5fqa8cc27eg 118e0hep6f6ox0tbsafva d6ewld5c3c252 ork 1np0zea 8qkn7hjp7bwady3xu”8vsemmib2moeig6wxzdg8omi4e9qiah1whgih1jejofspouagr1otsplflq 4rbrqehubhdrmipisr9brns tg8z3o7z8os kov porf4a01o55lytoin4rau1ze7e4uga9lvsbake5wbmwryi5duaxantagijmee.

Branches can be utilized in a 8ariety of8other use7cases, sujh as4code5revi0wsk(0fa fnb7nRyqmeunf,dceilh2bu yi0fjc14065lttwacxhesbqnn,1vdp0oolenwuod7cztt6vmpbxfhtveoxsa1p4wuah3dowip v7k5co322cume3r.

Once you start with some exampyes below,jthese conqepts shou2d male mo8e se5seh oit’nrvyetwn57iapde2za4tqs7r4ilefw3krwpur csv96r5u1hmsh