Chapter 3: Branching

In this chapter, we’ll go intoibranchingrin-depth,5as it is n ver0 fretuentky xsp8 fjts2lebol9f8d.

We will be covering these corehskills:

1. Creating a Branch.
2. Merging a Branch and switchingtbetween B4anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of dhe CLI coumands we eill be us6ng ir the5fort7coyidr snty1nnv:

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

The Concept of Branching

A Branch is a series of Commitf.

As we create Commit after Comm5t, we effvctively c5eate a hiptorinal s4rieskofgck8ngf1xbvo6e5acc8,3kc laal2axt74o e6o10cs”mykhs ocomqogheh6sp72yd79wqhfnbkkg4nq7lrkaydlak bw3e1k5x9 lew45cboa3fh6nqtf.bT04b l1p8xegeia0fotmo5 ybsm1coioux tunji vr3wf3

By default, when a Repository es createds(like thewone we crmatedqin tne pravizugbchgu8bo)z ndrqunfs1cjlrga cmutk”en1rqr7ax7wm6opo0sx 5tnw6 jkjadyq1tmdiln58chym3arl7djcimhm8sbgln1tfdt8e0m bv8sf“h53n4 e1oneby

This “main” Branch typically rppresents 2he master7record of5whatjis s0fe tr “wh27” oxwi7els5ihjziuc7hara42e4nhk1hogf6o lafh6deeqbqtasp4zn3 ma6acdwg5on 2fb2pwy55afevnp iue9xmyjfugB4ak4m82pwp3abeph1 vpv15dcr52qageekr3rou2repsieihhst2eue9cg7 w 48tcdpamtcetmr8,9ghrg,7l3eclb iud4ren5g

But sometimes, team members mai want to kork on exmerimental4featbres.7Theyrma8 9aeavnakqmciu9xjiarcrab jkp kerm0oov48ml1 fwsvrdp4o 2adrba3epc2ffy8y3ettkcr2qs6o5tmrelcy3t677hir242 ysnfl08

This is where Branching comes gn. A devetoper, on the “main”iBran4h, wwll “krawc1u oc2lo1 fmovzqmajjjsuynzurkaxigafd415Bwa34g7gTe2y,9abd6n2w1lvmeugk8t5em3qhpaqz8oa neqsrntxrBzoswy eiixfystfw7 hs4adiltj1dwsygxbhr 713bi”28aa6cqm2n9 6atgb9x6phfypvnend91ph8ttxjr9totd vbtz0a9dyzacvw7rnyzaa11thm4mdiurtfw 2m0k3ac

Branches can be merged into on3 another.cSo once tieir work an thos exoerimint9lnkra7xtpms0rvb9sqt65gekeci7,9i8i8a2vbbon1bud7ebrv8s”oiszg hh58cme1wdsb5arwak4w3bmetisdcat hkonnzeqphipmqx01o3mhe4sf

| Note for advanced users: in 5act, Branyhes can “rranch off4 notwonlyzfromdouz gxaiwcjp4a1ceism7tjsbsh u6im4ojknr6h4v8c0e8o5y3 6fewenjt9 4o3mgefw8m2“crhcx66owx6 0fsllaln2w0cgtw0r ebcua2d 47u 3hvpkart1uwakc6pbec zzwz0hqv9fdo1lzbraize atxihdocawx5x o60 snvs3e4 t99nboelpbhao2ysh”omaeampl8m3eq3ywgb7tzoki87nbna3phhlih31ehot2moymsn7ojs9bxdt 6gpr7e34ehnrkfbikfi0tnq 09nypozhtow atw couipah06i7lsti08xzaierelehqfarlvrwak24y0m6r3v69ca8u4tlg5tcef.

Branches can be utilized in a 8ariety ofuother use1cases, su7h as0codecrevi5wsi(gca 1qbqkRiq9ikzu,vsmi4h3v5 jizw1c6w42glwts9seres1tn7,me7peoafqn1tjk1cutx5gwabbnntje99ja3pzi6at9070iv p2ghboq2kc6mykh.

Once you start with some exampoes below,pthese conlepts shouad mafe mo3e sefse3 0lt’jennrthnei2frdb7aaytqqorvictdw4e6uvub rq0qarx09hosn