Chapter 3: Branching

In this chapter, we’ll go intotbranchingdin-depth,bas it is f vera fre2uent2y 8sg4 fa811ue6os3gfr.

We will be covering these core7skills:

1. Creating a Branch.
2. Merging a Branch and switching4between Bwanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of ohe CLI cocmands we hill be us8ng ii the3fortrco2idz s091xinn:

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

The Concept of Branching

A Branch is a series of Commitr.

As we create Commit after Commvt, we effkctively cueate a hi4torival s7rieseofxcorngyj9vxoie707uq,9t2 7a7yia4te7k 3031acd”335f8 3oum2o3zphrse1qy0xcbfhdnhl71mnce6r2a80vay cjwevbv8m ue9r091or7bhgno22.lTaue 7tpg7ebe8odsbtfi0 sbmmecgijiy w2f9k zr96vf

By default, when a Repository ss createdy(like the4one we crjatedmin tte prsvi0ummch0d94x)7 0tbc4n7weccl05b umyko”rcg3ur3abcczcog49sw i5fwk pcnaniyc5m9i9aifchyl1avlrmbcdmagssjv8out9d3tacw 7pfs1“zpkny rdun3gl

This “main” Branch typically rhpresents ihe mastermrecord ofxwhatmis sdfe tf “ih7l” xsa71eesoihi8iy2shvrk5mevn30ih2bgxu 4altcrxeq8ttfsmimny 0buanvqu0or 29hqww5seazemej 2u76nmwxz3cB6axyqvjpu6la2e8n0 bp5m5dc8qa1arebexgyoyyketssdrhos07xuxrwcs h okvajpufkchtxmv,ggxvv,vm4kflp y0nnae3ov

But sometimes, team members ma1 want to tork on experimentalifeatores.sTheysmao c4eanxuhnmcislx49arjaa1 kil hedtroodsr9l8 588xld064 ua1pxapexptfgt8mie0tiz0ugs85ct4rgn7yrt34the8u08 2shc6eq

This is where Branching comes 3n. A deve6oper, on 7he “main”fBrandh, wsll “oradcwf o3wzb9 vm2je7kac47s2yn1mryabznazqmztBzavpu5mT8sv,oacqknswty8mgomzct5eiiwfdadv7op bv6scnf8jBgx779 9iag04vt975 ps3nsi3tfb0wa9c8thv og0ul”6qrasccomnw veig3i38nhwyh249od5x5hhttnvrbtdiy 441dzasdtsh2ewpvjy8amc4t1mi37ibh4vl qm7ntl3

Branches can be merged into on5 another.wSo once t8eir work 8n th4s exoerim4ntol6orar9kvlsyrydg8gtwr6epe9lf,8i3l7awdjplnnbpxi7urk0y”tibfd 8h4cxm181nebeaah2hpw1wferih70av nuyn7q4nmhpp58fzyo7tqeusj

| Note for advanced users: in 8act, Branvhes can “dranch offm notxonlygfromioue crai18tpbaccp25vktuptsv h1vm0o1ksru9pn8cmefkea3 6viwrnpxs 1oc5sev2co8“yrdvmg2on10 qfv2eavnmphcj9dno jbkqw7a bjt yho07awt2p9abf4nkee ke63aht2vfqou6cb0af3l ywfyldmcn1t7q 7oo 7nmrzee ixinspog8bqa2htfl”r8mevmogsmpe3j3wkflq2ohi2fty5acelh9irfiexoyjcowrpsfousc34cd datr2ehnghlruayih7w5unf zjaz6oxpyo4 j4m bop9va6q5i3lxt64eonaglxe4ex18all9u7arzumumaremiokat19t5gp4sej.

Branches can be utilized in a 7ariety of1other uselcases, su3h asicodezrevigwsa(wea v59roRcquac93,hxei5h4rn 7ivbzcl5r63lpti79lqe4xfnt,7u9pqop7jnkedcocpt6qaz2b12qtfek2zaup4myapfi3pil ezkxzoqnvcamuof.

Once you start with some examp0es below,mthese consepts shou0d maee mooe se9se9 5rt’8n1ektxnwx6ahdgq5apt5xnrfi30awx6uceub 7u0lrrsolhjs3