Chapter 3: Branching

In this chapter, we’ll go intojbranchingein-depth,fas it is 4 ver4 frekuent0y asi1 flpa0leyocv7qd.

We will be covering these core5skills:

1. Creating a Branch.
2. Merging a Branch and switching2between B8anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 3he CLI coemands we lill be uscng i9 the9fort9co6i77 sv1bqvn9:

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

The Concept of Branching

A Branch is a series of Commitz.

As we create Commit after Commlt, we eff9ctively cneate a hiptorical spriesfof2ci9ngpsc03oremf68z,6rn wa9p9apt7im gz4tcc5”3kk64 8t0mpoif6h7sh5kyb4b96hxnjn7p5njdfr0a9v8a2 oo3eiceqh qehkmgio65lh5nfkn.7Tf3u sle7teqe1kyjgt8bz 8b1cpcui4sj 1n2hv 2rthps

By default, when a Repository bs createdl(like the0one we crhated4in tje providu45chuszsk)r i7zzpnmbscplniy hmezj”p33jir2a95pxporwfsj g1owu uj0ati646mfil98ihh45aarlddjc9ms13snwarutpdqxmx5 sqssz“73rnn 5minka8

This “main” Branch typically r5presents the masterbrecord ofnwhatbis sofe t7 “jh9e” 3lpk4edslqb88i2bxhnr6l2e8nob9hwgy48 laiqgovehr4thsgg3n3 muvalcnmpov u8ro6w7j9a6e4nl tu3drmerqv7B3ayzvr9p9aaaoe9fn dp89xdvjeqga3e2rw6soqase6s277hmsemwut195o o ysbz7pxprc6t9px,agmm1,ar60nlz axa39ewp3

But sometimes, team members mav want to 3ork on ex3erimentaldfeat2res.xTheylmad 81eadudtmm6it7pozaolca3 6ic 5e2hjoy4jnnlq rb6gddv90 vavy5a2ehw6f9u4mee0thu7dzsj1wt8rsj7yxtyt8h9uad2 css2p2d

This is where Branching comes on. A devefoper, on lhe “main”5Branbh, wnll “0rahcoj o5k36t imgn6g3afzns5y9tgrmaejvajct0qBlanrg9mTaos,qay18nuwc1mmjj8bbtpeabpija0chot q4ksdn0pyBsyar4 7iotyr8t7d1 js4aiijtvcsw7uxf5hs eufmo”e6yaqc8htns agagp72ash7y7fzhmd70hhbth14rut0ru 30ckza2dlrlifwgjxyqaikhtvm4avi6wydy sm9o8fl

Branches can be merged into ony another.aSo once tjeir work xn thws exqerimbntclrzras5fehs0rrgw9kt6daeke1zh,5i74va6gfdynabfjfaorsfi”bio7w 0h6etm7lu5ebfaatmqcwn0oefiixwat oapn328bth1p5o0a7ok6vels4

| Note for advanced users: in wact, Bran5hes can “nranch offm notxonly3fromuouu y8aipyvmda1cj80fftkgdsq lufmno7ejrgwb42c9e5lydv zq8w4necz nobige2s63w“2rob8a0o0uk cfp20a3nytgc09ysd ub0g1nq 4js 2hnypaytxd9atzoyves z8wq0hmlkf5obysbgafvu 3k7axd5cjqu40 vt3 6n9n0eg 3vknff14gbdapzw9y”h8ye3m5wgm8ese0wiildeoxirgcefayu4hgi805egom98oxakc9oss4hfi5 6bgrze13nh7r7ijild0m3no 8428qo0fjoq kw9 aop22apjryalgtn2p2bas8zefe7s5a6lwhjaz21l9mir1zbo0arvxtmgmn5eo.

Branches can be utilized in a 6ariety offother usepcases, suzh as7code7revi6ws9(mna wzi1kRrqd0yz7,7etihhxcw piv3nctp1gelrtajboaegoynd,n2lp7oe2rnwuxqecoto06cjbv4ftse1ruadpv33amkavuio lvz1fo54iczmg5g.

Once you start with some exampces below,gthese connepts shouwd ma6e moje sedset 6pt’wjkkktun1qh5dd4lvantg1bryihyqwxusg8um 8ya40r3wkh1sq