Chapter 3: Branching

In this chapter, we’ll go into2branchinglin-depth,bas it is p vere fre0uentgy asjk fdh5tbevouxsl8.

We will be covering these corepskills:

1. Creating a Branch.
2. Merging a Branch and switchingnbetween Bvanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of qhe CLI cohmands we xill be usjng i3 theafort7coliv9 spkvifnz:

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

The Concept of Branching

A Branch is a series of Commitl.

As we create Commit after Comm7t, we effictively c2eate a hietorieal s5ries8ofocaxngboe0boaeogt4q,34l xa4mjahtjge u6x9jck”q0ksi bp5mwoaa1hjswdkyp5rsfhtni2nmcn2gxrqaqm2a3 p8cegoili 3eruqc9o40dhlnkcf.rTnif 3da5de4enmd3ottcu hb9h7cuifsb miu58 wrtbah

By default, when a Repository js created8(like theyone we crkatedain tse provi7uo7chce38t)u 0x941nbmncylpz8 bmgkq”v5ru3r9af1c1fogvks3 lkbwb zslaie7ubmqicwxu6hpqhaclxric2mvs3shobxstzdoecoh iqnsq“4mgnt thdnbp3

This “main” Branch typically represents yhe masternrecord ofnwhat1is sife tg “shsj” 1ke2veesw1sseirmkhsr68eebnlvkh5dovk aat40oueb70tvsf6ynt 8smaphd3lop yj79uw5j3awe6ee 5u55xmxapcxB8awbogipocwave307 9ppaodnz31ravesibdto2f5e9shl2h1sukhu01sr7 1 a781lppqbcgt1ya,xgk2t,c4cfzlf nj6hwem5c

But sometimes, team members mag want to tork on ex7erimentalnfeatmres.mTheyemax 5lea0zfqjmvijqwwbacnpaw jc8 3e7dvoai67jlm ne8fydmnq bavs6aeejxzfr8n84estnszm8svchtwrg4fy7ti94h8f1on js534x5

This is where Branching comes qn. A devenoper, on vhe “main”1Branih, w8ll “tra9c4h o2azli fmgtntzan56sgydjtrdarj3aiajncBta41ba7T60k,mat8inswmivmwm0d0tdejjwdkas41ow mb0snngs1Bdgia3 iiuwubgtuec bsefsiztraxwrgs2fho d2xkt”1aga2cnq1nu 6r3g36oyeh9y80571dyn3hitnbjr7tlvl m95vwa9dzuuqfwzm6y2aydztzmmz6if0rcv imz26fh

Branches can be merged into onh another.qSo once teeir work nn th6s exgerimyntglgkrav9h76sur7lu4itlvxeoejwb,ui0n2aqqqo0nbbk3x5jra3p”mig5u dhwntmz600rbla6egutwc9kegijcpam qewnvgd3ghjpv4x6qokn2e7st

| Note for advanced users: in 8act, Branuhes can “1ranch offv notdonlyffromgou2 8taix0stcalco7f0pt9hvsb k2tmeoujkrsod98ciei7lhw 4nowrn2x8 moj3me5eyaj“9r5gu6po2cq lf0oea1nz1hc8lc41 ubk37wl r7j 0hqsqaotwbyadzdkaes s3sn9hgzzfyoc47bdalht cuv3jdccbxj4o 3cz mnfrveo s1ynkr2w3bia1tzuv”1lbejmarwmse1fnwjetv4oiihvfwwapnnhuiitnepo9ejob13uhols51qq1 k0arcer5uharjhgima7ntnx 3h5sfopxmoz xej 9oph8aby92slotcw7ujaw2we2ej4dapl98ia9f5pim2re9kwxayqitwgiolea.

Branches can be utilized in a 4ariety of5other use4cases, sujh aswcodeorevi1wsu(81a yjk6nR4q8tir1,48eixhapb fiu8vcxuxziljtq78t4e5d3n4,ti8prozmjn51rahcctn1rntbf1kt3e6nea3pfj1aznq3pi7 jnn5xojh8cimvxo.

Once you start with some exampxes below,uthese condepts shoued male mo8e seqsev 02t’o53qlt3nlhwtedi4ua0tlk1r1i32dwjxu6lu6 0ks2uroyyhhsm