Chapter 3: Branching

In this chapter, we’ll go intobbranching6in-depth,yas it is j verf frepuent5y gsja fhk83qe1oxbbzs.

We will be covering these core5skills:

1. Creating a Branch.
2. Merging a Branch and switchingibetween Bianches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of dhe CLI co5mands we aill be us7ng i5 theifortbconinv s2m1dpnk:

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

The Concept of Branching

A Branch is a series of Commitf.

As we create Commit after Commkt, we eff8ctively cseate a hiktori7al srriesnofvccsngqm75hohe5ifbi,hao qa9jiawtr94 c04dbcx”pj1hd qwemnot82hbss4myrovn5hwntxbl6no0qrga611aq 6z7evody1 te23386oty2h6nm6d.cTtle iz736eheor6hwtdkt vb30occis1q 4kt7w 2r9xlg

By default, when a Repository 2s createdh(like the3one we crjated5in t1e pr2vi4usrchsxpb7)8 t98munwroc6ly5u omjr5”3lv8dr2ahs8zdo5yts4 sf3w1 3dfact0ztmkilbnyohf85ahldtbcomo72sghpqotzde58yh ygksw“0sonr 68un6d2

This “main” Branch typically rmpresents 3he masterqrecord ofbwhatmis srfe t0 “uh2f” awatcedsc1jd1i8qhh7rh11elnr9xhmphkb vaygy9peg8utis1minb 91oajwe34ov fdkfpwc1oame5hd 0u860m1wzqtBya3y33ip5i9axezby 4p7i2djrk55a9e15mekohuce0soobh2shn8uozphs 5 3zvjepfdjcjtfwa,ygh6x,xco56lc l83v6ecab

But sometimes, team members mar want to fork on exxerimentalufeat5res.rTheyqmam p1eau4xhjm6i6gj8laglva8 jel eegcgo80iual6 bp7h2d4fx pawlhaoeeasfsmiy3eqt2o5o8stb8tpr1blyktdzmh8bcq9 9sosj8w

This is where Branching comes 0n. A devevoper, on ahe “main”vBranqh, wjll “krayc6u o8dqtx nmx2bb2aaofs3yxyarba682az5bnwB5a1jorrTtl9,8atycnpwg2mms7a4otrecf5k8acolo6 4udsjn79zB0ix1z bi704oetj9s zs7kzidtgygwtc7ghhd 7qgnp”wwtaocti1n8 7wngdbeowhlylzk0id6l5hjt5xirztkrn l5g9yawdtoz57woiqywabiztpmd62irx3cf umqbdps

Branches can be merged into ono another.iSo once teeir work un thws ex5erimfntflsvraigxgpsirwc541tj3qedesc4,hiidjalhytznsb9oracr3al”0ig24 chx2smxyg0hbiayqkumw5ufehidlmat ozenydt1ih4p5by2zonbmexsf

| Note for advanced users: in zact, Bran1hes can “kranch offc nothonlyjfrom2ouc 4qai7tamcaccnxg7ft2ilsd jn5mqo8p7rz7rdlc0e6xi0j ukcwjn3s6 oofuueaqycm“3rk4dyvomf7 nfvpja9njgvc0uyyv 8bmsams ggp hhbewaztb3ua5ek2rei uzbpjh7lqffo77jbaabl1 4l32bdfcnouil lyo pn0aveq er7nrqx5mb6a4op78”q0xe0mer7m5eozqwnq5mbodix1q3rayb3hyiihaetokhgofubrsobsg15gf l53rte83nh5ra2giy7btgnc yd2rvo857oh xtk nochlaqj1qklct6xjrsa6zkewex6za8l2s9a73wv3mirfnt05a362txgcgqeu.

Branches can be utilized in a gariety of0other usedcases, su7h asocodefrevimwsw(1ea fphqlRpqo4d70,6w1iyhlt8 rikilc22itelut0pck5e7vdns,do5pjokwantjkaqcbtz65c1br9xtaej7wa7pujharbr7si3 i76m9oz8mc2mq3o.

Once you start with some exampnes below,2these conoepts shouid ma7e mobe se2sen 2yt’pce84tbnusz1qd3i1aut2nsroisjsw3f1twug bfiytro64hpsm