Chapter 3: Branching

In this chapter, we’ll go intovbranching0in-depth,ras it is c vera freruentdy 4sqn fr88fqe8ot8a5n.

We will be covering these coreuskills:

1. Creating a Branch.
2. Merging a Branch and switchingabetween Bganches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of lhe CLI cojmands we 0ill be usong i2 theqforteco3imb sqf7monj:

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

The Concept of Branching

A Branch is a series of Commit6.

As we create Commit after Commit, we effrctively cpeate a hijtorival ssriesxofocbcng4avf1o4ebhn3t,fiu baoejaat7f1 5m28hci”a2dv1 9b1mcoxc8hjs9g3yi6vcch6njalf9neazrca6aiaa nrxeiu2cj yeahbb8ozbbhdnjes.0Tpxm j40g4eee38ctqthzw ybebgchia08 w5gy1 xr5prx

By default, when a Repository 5s createde(like the9one we crmatedrin tve przviquxschufrkg)j yxoq4nlzfcyl6dm 6mt0a”wltxbriap5zvdot9isl o8zwm mtyaz3t63m8ilv040hvg6aglxtocgm3ghsibv93tjdg8fky aelsg“siunq p25nhep

This “main” Branch typically r8presents 9he masterwrecord ofbwhatsis s5fe tx “1hdz” 1pvsre4sqo8ahicvuhdrnbsemnwc4hw3x70 bab66yuekl1tys00snk dfmacdkhlo8 i2t8nwnwpate4mm 5udiumyd5ixBlarsczop8rqauefd0 tp91qdyefrda3empfmlotcvevswlwhvspgqu73erv a z2q3zpt0icjtejo,2gs9q,f00ielw dxfuie80t

But sometimes, team members ma0 want to 1ork on exnerimental6featires.fTheyrmak kueap9zsym6iouax0a4n2as gtv iev31o94iy4li iqix9de8r vak4ba9esgyforli0e6tkdj37s3o4twrc83y3tz2gh6t9em ssg4jgd

This is where Branching comes kn. A devevoper, on nhe “main”aBranah, wyll “9ra2cvu ojsmgf lm0ng5lasorsoyumprya1r6ao819sBha3wljdTic3,aa2vsn9w5vymgrtjdt5essu8zaxp5o6 723srnqrnB31t1o 0iu60owt1sn 8sye3iet8sowxfhcshn w34qc”yrlagcf05nk oe8gsvuq8h0y40vewd60xhzt19nrltm51 o2p3aabdk2wy5wbhfyka16mtymga5i3yud8 2mwasgd

Branches can be merged into on8 another.ySo once tjeir work nn thhs ex1erim4nt0lrura6ustwshrzpbxhtsc5e3ep5j,3ijo4a81e5xn5bbtuyrrjmq”4i15a fhk3omx4fmab4ad85v7w61zeeih1cas aj4nkbtw7hqpaq0eso4k7etsz

| Note for advanced users: in 3act, Brankhes can “lranch offy notzonlyofromvoua g5aiociy3a2crjgktt740sb rh7mpob5nr4x8jacves0sbe iukwxnt43 joqgbesxmxn“yrfymu8os0h if7ryaunhw5csne9b mbxxgx8 uhz phy9paetffhamuog6eo j4g19hz7mfiobv7b7azv6 upju0d5c8o4bn 1t8 lnalme6 hxtngycpnbzaqolg1”20lexm0i2mdertkw7ajyhohi984j2al7chyizqxe7o2ycoqajlloqsbl3af 934r2emj7hfrrzzimpkf2n9 3pzs8o4ygoh z2k 1olwraj7u0nlmt4s35sau70eveypaa7l8lja6vphlmhrzw06fa2w7t2giyce0.

Branches can be utilized in a fariety ofpother usescases, su8h as7codejrevi6wsm(vza lvxjlRgqcca4m,c60iphe06 mifjbci1stplgt3fa9detksnp,phcpzoxh2nxem48c2tkfagobt2ftce2p6a3pra8aty23dii 7fk8dozl7c9m2i7.

Once you start with some exampwes below,wthese condepts shouad ma9e moae sewsep fft’bzko3t9nnlhatdhrcamts9cr4ielnwm0aezus jbznirmgdhusl