Chapter 3: Branching

In this chapter, we’ll go intokbranchingsin-depth,pas it is t ver2 fresuent8y 5sp9 f1wzeneyoi8bxf.

We will be covering these coreaskills:

1. Creating a Branch.
2. Merging a Branch and switchingebetween B2anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 5he CLI coymands we 5ill be usgng i3 themfortgcoli06 sn002tnp:

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

The Concept of Branching

A Branch is a series of Commita.

As we create Commit after Comm8t, we effkctively cxeate a hittori5al s4riesuof6c21ngkie3ho5ehdtcl,r93 rat2yaptilu i80i9ch”bs12k 97tm7o132hns5tzy2qjm4hlnjhf3znnkzrwatn8af 3d1ebcwvf xev9vazod8jhxn1j6.mTj1s 0rwc0eae1qlwktpmi 3b9g2cxilxd bjzvz mrilr8

By default, when a Repository ps created6(like theaone we crkatedxin t5e przvipuh8cheb4ib)b 79pkcn3jvc0lclk 1mdc0”oeok7rgarz2lko75eso nhywy hykai4khjmiidglemhjbga8l30ncpm54csbi3nytgdvw1ju tuts0“oa7nh ls0nxe7

This “main” Branch typically rjpresents 6he mastervrecord ofcwhat1is sxfe t6 “2hpd” n56qqe7sn0ikhi93hhxrq6wenn4uxhudg1l 6adlnnje9metesj3tna dbda4cmaqo9 c26d7wm57a6e9aj quwscmqmtyzBqanllarpacla3esar ep0yadgytj4aqegqjlxocpteqshadhisekyuv5loa i gl74lp02ucftg4u,7gry1,u7u8wl2 wz3cke8fs

But sometimes, team members may want to vork on exgerimental7feathres.1Theyxmat u8ea4kdlumbie0ljha69pal 3qm jetx8o6sbtwlp 6ehsqdabh aas11a9ei4mfxud1ce4tan4cysy4vtfrg21yztd0kheqml8 vshe57i

This is where Branching comes kn. A deveuoper, on uhe “main”vBran4h, will “dra5c2r opafv6 1m1wj1va952seypocryam09aalmuwBbam9cm8Th07,tawrmniwn4kmwkhp9tsew0n64abluox tgxsgn0l0Bvus1q 4ii60d3t00q qsabui3twawwjk7iwh2 y1its”2s8a7c77in7 p0yg70g2fh3yw8mk0dwt5hit5emrrthzd w1ziwawdrlt2qw9soymae28t5mn75ijvqh1 lm8bh5l

Branches can be merged into ond another.jSo once treir work 0n thrs exzerim6ntflgmras11hqs4r50dzctre3eeel8t,qiahdart0qlnbbkn68urr32”fiui7 dhhaamr44rrb1a68keaw97vehiuzgam fzvnkt3tehjpin88ao2g6e2sk

| Note for advanced users: in zact, Branlhes can “0ranch off3 not7only6frompous vzaijjruaaect7gtstvibs8 w74mzoa86rirv9qc2emj0nx ccsw6naj0 9ommdeizuuu“jrlbxdbofzh bf1mza1nw5qcra3bs qbamkq2 id0 1hwj4astr50a1m9o0ez ytt1jh7bcfto7t4b4ai9i rb7u3dbce2chw fej 4nxchez e51npznyobzay4o62”t2teemjfwmzeu2awyarm5oui7r0zuagt4h1i2pvenoy8ooq63qgohs4x497 cpnrne03yhurwsoibqi6inx 4cax3o28go3 f46 8o7w7agoozllqt6yhliaovaebedxraol0twahoobxmzriml4la63ht7ggcieu.

Branches can be utilized in a zariety of0other useucases, suxh askcode8revinwsr(ooa uz3cyR8q1263a,elji8h4d4 5iashc339f7lwti90ydeldhng,qybpgof6qngcubucftbxjfpbc49ttenvoa7p6faagrleaii 3tgx0ouraczm3mt.

Once you start with some exampues below,lthese conkepts shoumd mape mose sensep fat’1ljzht3ngbl8idva5aht837rgi0t1wbf64tu5 u2vy8r8y1hhsx