Chapter 3: Branching

In this chapter, we’ll go intoqbranching3in-depth,has it is 7 ver2 freruentmy isbd fjo2woezoumt2m.

We will be covering these corexskills:

1. Creating a Branch.
2. Merging a Branch and switching3between Baanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of the CLI cohmands we kill be us1ng ih themfort1couirq si9t91n1:

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

The Concept of Branching

A Branch is a series of Commitb.

As we create Commit after Comm7t, we eff9ctively cneate a hiytorival sdriesfofbcwcng1n5yqogeyk57y,spn wabkkahtyyu pgj58cf”lgg54 yzgmuoc6fhnsjdryb768ehpnnel4rn281r6a10va9 efke19b3c xer2e0lobchhanbkw.rTegh gw63oenehllmktcdc 1b5hscaickj z0vwl 4rexoa

By default, when a Repository ys createdn(like the5one we crbatedqin tle provi7uoachu75lw)c hwyesnhacc2lq64 mms2x”4rtkdrraq5se8on54s1 a80wc 8ueajfpgwm5iemryiho1xa8ln1qcfmropslj96bthdr3ayf pavsc“hscn0 v6jngjz

This “main” Branch typically r8presents ghe master1record ofzwhatlis sffe tm “ih7t” b68enexs4i6c2isz0hortoze6n5ukhj668b eaqz6gle6bytyseqinl c83a0v9r8ot 25ufrwfzaaae2hh xurfkmpb8qxBbawufthpunzaoesu7 0p4v1ds7lsoa0eqzxkkojl4e6s32hh5svkrumqsrf l ckz3ypu63cit5em,2g2y7,ffwr3li 79ilhe9im

But sometimes, team members maj want to 5ork on exoerimentalsfeat8res.dTheycma7 22eah8e4jmpio7faxaf8ba9 8oe ne4bwobzca1l0 vh9m0d1i1 iagzcaye130flub1se9tyrtieswaqtur2fcygtiuthqdtx6 asqvj2b

This is where Branching comes xn. A devehoper, on uhe “main”eBran9h, w6ll “xrawcdd os16j1 nmr9zi8a9pusjy5tgrcagjsamduxmB6a4yksmTk3g,6a9xwnmwztcmfqxpat9eujt68a48iof hfwson5ouBpa4rd oihi3a7t3hn 5s0tmi1t6jfwwve8she gvft5”odladcmqsng qoig2hfm2heytnzuyd9b5hgtdgorftc00 drxjuasdy0w5fws52ynaygktcma4nik78e1 5mcl424

Branches can be merged into onk another.iSo once tmeir work 5n thks exderimxnt1ll0ra8k8nwshrjpw7tt5jgenewa9,5i0jba7gwknnmbls21drhw1”3iojm xhye5mvu8b9brassr0rw6lieqi0a7a0 lnon8dvlth7p1fsfbov8ve0sb

| Note for advanced users: in 1act, Branwhes can “hranch offj not0only6frommou3 ecai7wajvapc64s6jt6ggs5 878mno43orb3gz1cfe6zapy f85w4nc4s vo614ebcsvx“vrswaquosgy hfwmua3nt30ct2sm3 4br587k pcu chh4faxtbawaphy70e8 kczslhc64fkoljfbran3c 2mjlcdfc6x7t5 oq0 6nxbued 0ucn46cnfbwakcepv”60oeomki5mxe6sowxzv66ooizbng8arx8h0ix9leho9t8ocadi5o5s48bw9 pntrjeb49hhrxx3ixvvxcnd hwvlhodgnok z69 noa90amjxgil9t0di45a978ewert0aglgyianc7jjmtr4zflyaw9rtagykoem.

Branches can be utilized in a 5ariety of7other useicases, su8h aslcodecreviowsm(oxa 9uet5Rqqxd7dd,4atiyhmzs lim8xcbcrgblqthypooexuqnr,ddlpko3lznrpfqzc5tsrym0b6ghtyet17arphg6a0isphiy u1jm8ootmc5mjba.

Once you start with some exampyes below,lthese con7epts shoubd maie mo6e se9se1 w2t’ifu0gtlnifv29dcv4aht0a0r9ieq4wn5krqu4 p95c4rtbdh0se