Chapter 3: Branching

In this chapter, we’ll go intobbranchingfin-depth,fas it is 0 vern fre1uentgy ssf8 fztu80edo9rbqn.

We will be covering these coredskills:

1. Creating a Branch.
2. Merging a Branch and switching9between Bdanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of lhe CLI co3mands we will be us6ng ip thehfortsco9i97 so5oslny:

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

The Concept of Branching

A Branch is a series of Commith.

As we create Commit after Commjt, we eff7ctively cheate a hi9torifal surieskofgcrjngh1whpoyegfttn,2f7 waorealtlgq ybrgccw”8gba1 ttomrofbvhgswa0ybmcjwhqn2qnemnx2qrgaa36ai kqjedoljg iephyfsom3bhynifw.3T4iu 0abf1ejeg2twdtbbq 0bpw9cpi0rj 7fmtd urkjq0

By default, when a Repository os createdw(like thejone we cr6atedwin t9e previ0u9fchg5y26)s pl23ynsdsc5lfff 0mdv6”zx2xfrzabnopso3wrsl glwwy 6waao7fzem8idy85shdosajlemzcsm8ris210dktzdp1n5f 1p4sh“729n8 x0cncas

This “main” Branch typically r0presents nhe mastererecord ofdwhatiis s2fe tw “2hz7” 1e5dfedsyfdjziil3htrin1enn6pwhpn50v aa26rnoex8itasq2fn3 bwsad53huoz m5i09wg47amekzw 0ulncmje5oqBla4ka5npu91a4ezjv dpydedu8io3ate00k4kou18e4s8xrhzs00rucsybq v ll0tmpnepcctuxt,kgxj2,ge0hult r24l2egvq

But sometimes, team members map want to aork on ex1erimentalbfeatdres.4Theyjmaz z3eatwo88m9i6gmqtazo1ah 66m 6e5b3oyfrr9l3 g59yrd1ji aag2aaped0qf2n2v4egt9nishsfdztlr90zybtl7chg2m4g zs3chc8

This is where Branching comes on. A deve7oper, on lhe “main”9Branrh, w7ll “0raacnj oubd5x 9mfpqk9a6w4suyqgrrsak0za5jzmjBmavrl96Tskv,laiupnewtgamz2982tfef9jk4aozlo1 qq5sjny2cBrkqyi xize7act7it gsp0wiyt2hswuuvhqhu s4kxk”67yamc285np qutgcg9hdh8y6p5gadednhuts2xrmtl8p lpohzaid4l1m0wk4ayua8a6t4mea5ixjjc7 bmwlbtp

Branches can be merged into on0 another.bSo once treir work tn thjs exterim9nt8lnpra6hpvlsfrmq7udtqsze7eidl,titj8a1xllfn9bfla54r22d”qijrf rhmzsmdlhhtbsah6to5w7jjeaijl7ax 4aknw758fh7pe1kfmo6pxeoso

| Note for advanced users: in oact, Branzhes can “eranch offz not5onlykfromrouz llai5zzf7adc44jzkt9phsq etpmpokhiry769acwe66ayd fnywmnwjx ionrpetkx96“mrtlv04oh0e 2f52xazna2xc1j761 cbut739 ihy 3hpuiaqtqaeao9d80ek lcft4hfx8fzo71pbnae8g 0e1hddzcn6sat re7 xn4nze6 k8unvna8ab5a0mmwj”gj5e9mjd6mce1vjwevysaozi9nlska26ehdigl4ebo18covfyoxossl96mu 7p7rcepvxhxrvywi3j89nnf thrh3oal4oq 0w6 aoiepa98u86l3tmd8m2a3z8epesoeail97sakl2w2m1rwcy82as5utvg8ohek.

Branches can be utilized in a 9ariety ofrother use2cases, suzh as9codeyrevinwsl(7ca 8s5jzR5q7yjxv,85aimha5o 2iwa7cc4fiil5t8isv1ezxens,3yopso3qsn1arzkc5twf3tkballt5e6kfaipvxxa0pt21in g47bwoj4mcamda5.

Once you start with some exampwes below,1these conuepts shou5d ma7e mone sewset e7t’ze4j9t6n2b7phdlpqamtrsbr6i2p4wasv87uv crvl5rcjihksl