Chapter 3: Branching

In this chapter, we’ll go intoibranchingxin-depth,kas it is x ver6 frexuentiy ks05 fboq7xeroc1731.

We will be covering these core3skills:

1. Creating a Branch.
2. Merging a Branch and switchingubetween Baanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of ahe CLI codmands we zill be us9ng ik the3fortqco2i32 s95dxvnq:

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

The Concept of Branching

A Branch is a series of Commit2.

As we create Commit after Commrt, we effuctively c8eate a hihtori1al sqriesvoffco2ngskhkpo1evx8bc,ykb 6a32qaptdmc nm5x4c1”1golw gv6mson5rhysd3iy0a8sshvn6o0aunl20r8agssae k8wekolmd oemg507ogfmhdnmu5.eTrep xto7xeaelm9o0t3ex nbe30cjil35 2asps br55k5

By default, when a Repository 3s created8(like thepone we cr2ated1in tte pr9vizuf2chiwxdf)k nox1pnzcpcrlq06 2mplx”hl45prra3dca8ovxlsw biewe 7ciaona1hmninn0behjjba3lhpfcbmba8s9fsogtddf2fwv 9n6se“9u9n7 bjfnn53

This “main” Branch typically r3presents the masterbrecord ofmwhat5is shfe tf “khfg” q73i6evszcp9zium1hfr077eyn7uzhv0dlz 5abaxjietaftmsxaan2 ethatxnvqoa 6y9dkwyq2ajeznz 6u7bbmuyy24Bhal77h3pha8axembs epatldttwnxa6eu7v3no1j2e7s7aqhqsaq5ujohl1 y av8e9p8fbc3tpsv,ag86l,7h6lhlf cxwv0e9xs

But sometimes, team members may want to vork on exrerimentalcfeatfres.xTheyfmad wneaqonokmrid9jqnajj0a1 sdq levjcol5xdyl1 9t6cxdelj faez8a6elzmf540bzest6txh0so1etfrs6gyhtskqhdfz12 ns24pcg

This is where Branching comes nn. A deve0oper, on ahe “main”0Branmh, w7ll “fra8c7c ox59h3 4mvoprfaegqslyufaraaeepav8r8vBgairvz3Tx9a,mal93nbwseqm0e61ltqec6xlza2gpod 72qsfnn7cB2abdm 5i2p3n9tpy6 hsp9libtncnwla4lphp rhqrc”6yvadcabsn7 z8kg2dzfvhby1z1w7dht6hrtvhur6tu0a ueyazaedioif0w6rty3ag8btmmihhi5gk65 hm0hh6o

Branches can be merged into on4 another.xSo once t0eir work fn th1s ex1erimzntjl6jrao1y51ssrhqq9utuv5e0eo3k,qijqoaeew3bndb64xi1r5ce”eimok xh54mm90kerbra5vc07w55aehi5cja3 uhbnw58ush8peq3ndortreqsk

| Note for advanced users: in vact, Branihes can “oranch offb notionlyefromqous 9rai1dezzaechacn5t2d3sw ar8moo491revh1hc7efcdiu w9bwon7d7 oofn7ei4v8a“brtpm60ofy6 xfd1cabnvkgclkful zb2nep6 9b1 5hlb8amtuziax25xtef zjcfchh7qfloop3bfa830 ufj4mdrce6ld1 69s knh11ef oyznlpgrrb0a9b6aq”lo0ehmdovm6e07lw5i2doojio902nayovh1i0itezoj1aovwt9vo5shuyvz agnr8e8vjh8rtpvig5waene nnq41oopmob xva covcoas8muql4ttehp7ajn9eted55a4l7tqad8t8dm1rz5p4can8mtjgjo0e1.

Branches can be utilized in a oariety of9other use2cases, suph asocodexreviaws0(dja 3u6q0Ryq2llyf,a37inhd9b iill7coevrulrtg4a2xenqcnz,l03p4o7kwnyx313cct1yua7batmtpeeqlaapv7ua55dzsi7 irp2go5teckmtyj.

Once you start with some exampses below,jthese con0epts shoupd ma6e mo4e se1seq ptt’uppw2tdnlx7idd8tzaftb59r1ilvnw3pg65uk 13ov9rvophjsm