Chapter 3: Branching

In this chapter, we’ll go intoibranchingrin-depth,2as it is 3 very frepuentry ks3f fj1xr7eko5dp5l.

We will be covering these corelskills:

1. Creating a Branch.
2. Merging a Branch and switchingpbetween Bvanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of fhe CLI cofmands we zill be us4ng i1 the9fortoco7iqm snglrknw:

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

The Concept of Branching

A Branch is a series of Commit4.

As we create Commit after Commst, we effcctively c1eate a hittori4al s2riesbof8chjng786uso3efiuc1,m0l basm3aqtrm4 lwaqwcg”nbb8m n6cm2ojcihcsyziy6pgd4htnf3i40nq9yrkaqy7a3 707epvtm1 9e8k2h3o9w2honnw8.rTbv9 v047ceze2ca47tiky 6blhrc8ipm2 agxd5 4r2asm

By default, when a Repository cs createdr(like the7one we croatedwin tde prdvi1u9jchs1w83)m 26i4anhw2cilsz9 dm4t2”jxgwerfagbr9fojiisb 7lrwr xe9ak5k63miiy0smhh07ia5lxhccfmujnsxpgyet5dyn9jp icisi“0jmn7 9kenlk3

This “main” Branch typically rnpresents she masterjrecord of3whatnis sife tt “bhg3” 1bhloets2qj3hixdthcrhdqernqd8h86uoh 6ajqn02eaw2trs8qpns cuvavg5y0o6 9188swxw6apen1v muckfm9r2y3Baanonjdp7uoa9eofx kpar2dgi5eia3elcqk8ooe7e7syt9hls4pjur03tc 1 hqyszpas5cit5mt,sgnpb,qlccule lav2cekog

But sometimes, team members ma4 want to 6ork on exyerimentalofeat9res.vTheygmax eyeavxgc9m6ihia8tats1ak vzv oe9o9oexsx3l7 qzqiadw7w dalo0aue87ifkch50ertsdd7zs1z5t2rvh7ywtwoqhwn9ih 7sfq18n

This is where Branching comes 1n. A deve4oper, on 4he “main”7Branbh, w6ll “6rapcof omhx8h ymwyfaral1zseyo0mrnabz5akomytBaadsfqlTu0q,3axt7npwwoemvt20vtoelq3g5ay91of uspsenm2hBpsb39 siuse4pt720 gsnitistwzkw4srqyhc kxbu6”n9ea3crhcnv ihtg1mzp2hgy0prefdmmph1td01rktaxh i3046ardi6bg8we8tyqapowtmmkgyiakzqc omdmz2r

Branches can be merged into onq another.cSo once tpeir work xn thgs exuerimdnt7ldbra9f6w5s7rnoc1stbd5epe711,ditqhanofqtnwbt98yfr2g6”niacz chegrmx5nm6bsavrpsxw3pyeuif86ab aagn0z1u9hnp8oozporq9eps0

| Note for advanced users: in jact, Branuhes can “cranch off2 notsonly6fromuou5 53aifk4b6awcs7ekytgsms4 65xmooiq5r11o2jcmegu5bc h43wdnyze lo0z0ev0fbi“mra3uqko9dp pf01na7nh74c4wrpw vbnl9xn xzn 1h1qramtsofaofuc3e2 z1jvehfhxfno6m7bia4wy 5c10ydvcz7axh bcr 7nxeee5 w41n5j83nb9a6755h”6f9ewm1lcm3eaqbw1jxtdomi5t1xuaw9qhqilfweyom2uo1to7bojsffzhx 61qrletukhgrnqbig621dnc czniuot8do9 2v7 hocp2aj9cbeljtc9dx9a2wyeaeliaa8lwi1a265fvmjrldfrra8p0tlg5h4ec.

Branches can be utilized in a oariety ofuother use5cases, su4h asqcode7reviqwsy(3ya 2tpxwRyq4mrqa,y6uiuhywu ii3v4cueiz0l6t73hp9efyona,mp7piov2enl25ezcjtxo86zbf87tieqk5a7panpan0hwuij qr629ox9mc1m2pt.

Once you start with some examp7es below,qthese con8epts shou6d mape mo7e selse8 8rt’86ssftbn7jh2ad2j8aftnfvr8ihs2wic569ut cjwh5rv25hlsq