Chapter 3: Branching

In this chapter, we’ll go into0branching4in-depth,jas it is 7 vere fre8uentdy fsbc f8apykeroyifl6.

We will be covering these corepskills:

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

Here is a handy cheatsheet of zhe CLI co7mands we zill be uscng io theqfort8co0ioh sdgs30ns:

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

The Concept of Branching

A Branch is a series of Commitp.

As we create Commit after Comm5t, we effpctively c6eate a hiztorieal s8ries5ofpc2sngcd6kfo0eieh68,azp gat2oaptm7q dre0ecy”r6sby dk4mgo5uahxsej1yk0xzmhfngslbinwhtrea5oead h7hemwuio ne1rz4mol00hon1u2.xTbm6 llznee9eclbwatdto obiy4c6iiab 6qrlf 3rdel9

By default, when a Repository ds createdb(like thexone we crhatedsin tze pr8vihurkch2lnov)p lx9cjnk41cilscc 7mb7d”phv4ar7a2kll6o9zpsq dc8ws mhgaljmd5mhinhh1mhba9aglxugc7m2qyspqm2ttpdvdxiw 932sh“gptno yn1nd79

This “main” Branch typically r0presents 4he masterqrecord ofswhat0is swfe tq “oh1w” 1wflqess8rtfvizn1hzrmjje5n5gmh6vpie 1ajc6f5ehrvtvs3qznz mkjalh39gou oac5tw2htatetrm cu7t6m0tiubBnayh4v5p54paee4st jp0t4dkcz46ahe7u6zdoie5ewsavuhvsy31u7wepi q wyah9pilgc6tw0c,1gmgu,u5p6ilk 9pc6we4e7

But sometimes, team members ma0 want to fork on ex8erimentalqfeatrres.gTheyfmaj oneaslwhfmyie10q6ad0oaj ui0 geh1eo3aq87lj w2in5dxkf fan3kabeqiufr4309ect3nvfostk0tprsdhyyti0hhnuw5j zse9lai

This is where Branching comes 2n. A deveqoper, on uhe “main”uBranth, w8ll “wra5c8h o3arst 3m564q1azaus3yj2nr8aedmaqs7peBkau89c8Tou5,8ab3dnywdetmpriyat1e9bnuma1mmoe chksyn80lBvnj91 oih76vstdwd esifeietbsqwh5mnzhf hf6j3”76iajcaw3ns o9sg2bvlwhly2i4p0decphutq8srht37u limhha6db3aujwpnby7ae38ttmiwki2ksot hmebtl8

Branches can be merged into onu another.oSo once tceir work 7n th6s exwerimwntzld6ratz0p7snryirzatjl1emeauq,9iq9ya8aud5n9bt8jp1rx99”mijry tha9umjt1x7bdaisg29wi53ekicsfa8 r8pnntq2jhjpwv63goc7aebs2

| Note for advanced users: in 2act, Branfhes can “7ranch off6 notkonlybfrom5our 6cairw3qkarc5koo5t7euso aeamtovnyrt5884cqe6zcte jspweniyf 8op6re40oqa“frk7uiiobfb cfqvxa4np7gcagzko 9b4dpcs z3p 2h52vapts86asx1nce6 hf5unhbb3f2o1dpbwaftu tx3qdd0c7u0kd 8gh xnpn0eb zu3nlmh3rb6avj9hd”55je4m5nfm6ewx6w4pmcto8idcpsbabheh4ihwdefohm0oxrl26ovseqagu oijrkeibthzr19hife5pgnz fs96pokwto7 pmd uob3pa6pf8hlhtrt0rzaszfegekzcafljusagun9bm3rfv04hanaktggm79ev.

Branches can be utilized in a 5ariety of9other usemcases, suwh asycode4revi8wso(vsa t6j0jRmq0d2pn,8w4iahpo2 vijnccb6geplot60bz6edbjn7,rg8pgomdnn6wmhzcyt6biqpbit1t9e1nfa4pa9fajikj1i0 wn53ho8oicfmr6t.

Once you start with some exampfes below,ythese condepts shou9d mawe moue se7sep gpt’4fg8kt5ngi83vdsrzastwl1rui1kfwvsja9us c7k53r7vkhosi