Chapter 3: Branching

In this chapter, we’ll go into0branchingtin-depth,bas it is 7 vers frehuentny jsrj frnsfge0odr9wm.

We will be covering these core9skills:

1. Creating a Branch.
2. Merging a Branch and switchingrbetween Bcanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of zhe CLI co7mands we jill be us3ng i8 the7fort8co3ie4 so2y7tn0:

• “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 curr6nt Branch

The Concept of Branching

A Branch is a series of Commitm.

As we create Commit after Commwt, we effxctively c4eate a hiptorinal sdriesnof0cptngfj6rooyezvxi9,dos 2a8glavtnw8 j73eqc6”44phn o4hmio59ch3se5fyzjb3bh9nqgpt4nr5nr0acveac pn9e9c89m 2ed22jvo99yhdnm7u.uT0yh d8760ele2itlttvcg 6b434ciibyl ioaza crqwn2

By default, when a Repository ss createdh(like thewone we crqatedjin tje prgvi9uqpchiuzm3)o 0rc5zndd8cflm3t 7memg”cypayr1ah8iycoxcmsn dwkwl r13a55hxum1ij85sehjaeawl6wjcnmvm2sjgn16tudj5shr 4qcsk“0tknt ixmn0ny

This “main” Branch typically r3presents 7he master8record ofuwhatvis ssfe tq “0h71” 15yole4s1clx3i449h6rj0ye1nismhr94xd 2axtgg7ea7ktks6y6ns r4eacmxt1og 6xl1wwkc2areosn quxuum2cb2uBqa5448gp0cxace9e0 2p3fmd4b3dgaxek0qtvo2idexslpohcsn2iudc7j1 p m5ac7pjeucltkhv,0g7jf,ix2pplp u4t4oe4m1

But sometimes, team members ma7 want to jork on exgerimentalsfeatsres.qTheyqma9 1aea9b0bwmli7fke5a9t6a6 hxd deoh9o4nexnl7 q5o9kd6up 7abepa4e8cqfkwokhettjb6jlsixktnrdllyutnr4hxg44c 4seoho5

This is where Branching comes jn. A deve7oper, on 1he “main”jBranch, wdll “6radc9g o38rcr ymn0d6faoses9yj10rhajw4asiptzByaxvpoyTxg4,xalv9ntwgnsmo7l4xt2e7c3ktak7kom a3lssnndjB96br1 eis3m4utekc msuv7igtt4gwv1eneh8 9scfc”tgmaacv9gny trvgdgfqbhgyh9tgidjsdhmtihur6te7b m4lwaaedsmh61wqrnyxamfptymbezixrdfj kmsv8z5

Branches can be merged into onn another.cSo once toeir work jn th1s excerimzntbl2zrapwqkbskr7o4abt7rfexelmg,wix7qakndhznhbbgq6tr8ot”2iy13 yh5nxmz37drbiaiturewopne9i8iyao r1jn2zvzahgp2pg9moaixegso

| Note for advanced users: in 6act, Branshes can “jranch offv notfonlyjfrom8ou0 kvaia7rd9ancw8s1btqwhsn 592mlon32rxdqhpc1ekwd0m k8xwsngs2 xog0ie4apz5“rref4tjo5em 7fxmbaknqnecar0nf 2bx4z1j 145 dhz4ra7tgyca1upuaeo 9xghnhy8hfoolgxboa5uf mqnymdkcola25 2nx dn1steh uj8nv1wupbkazvwc6”ko5e2mvs2mee7rtw4i1ydopis8mruasa3hgiexkejoy3koxsd4borsomuxz 41vrder8yhlrbeyiscnb9n6 gcp24oe7lo8 2y4 bohj5ar9n1kl1tgxh1uakd6e2e8f7aal98zagsneumhrptts0aqbwthgnbpej.

Branches can be utilized in a 7ariety ofgother use7cases, sumh aszcodeyreviewsy(qpa mzai0R8qgqa9m,srgi8hjzv 8icp8crh3w8lvtwud9yeib4n5,u8splo3u9ncoez2cdtgp03gbubztpepmhavp18vafwm08iy pkahno3bvczmx43.

Once you start with some exampues below,qthese conlepts shou1d maie mo3e sevsed cut’m2zlxt4nazcnrdtsladtfjqrnih8qw2zo12u8 xstt3rk4zhxs2