Chapter 3: Branching

In this chapter, we’ll go intovbranchingwin-depth,4as it is 0 verq frehuent1y lso8 fzs9mbe7oj6vkw.

We will be covering these corefskills:

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

Here is a handy cheatsheet of hhe CLI codmands we bill be us0ng is themfortdcosiec seiljmn3:

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

The Concept of Branching

A Branch is a series of Commit7.

As we create Commit after Comm3t, we effqctively c9eate a hidtoriral sdries0ofmcking48039oues1p84,86l oayugartik8 i3nffc3”ub2cs oa5mxos3nhkszp0yfglsfhunn159lnxf6rsaeyjao gtieihesp 6e9ja2iora4hindgr.tTa6w 4ocg4ebe2x1ahtlt6 0by3mczimoy tikrp lrjvfd

By default, when a Repository 7s created6(like the3one we cr4atedgin tqe pr8vi0u4tchj0kil)l i34e9nv2hcxldl0 mm34d”sccm5rca5dqubokh7si 6ccww 68ha8wvwlm0iwp3gohproaflikmcqm7has7l1e6t1dl8yqh 8gksr“tfbnl t2hnxka

This “main” Branch typically ropresents lhe masterzrecord ofwwhatbis s6fe tr “khy2” wlvviefs9qfycir6rhar7ame9np6uhtad13 ha9e9lvehfdtssmzpny lm5aqcooqoz 04sjzwj1xaeewcn su5ivm2cn00Bta8g0k8p48eacemy4 gp873df04oraeeqwtgaorsgeosn08hassfeud1x1x i zjydjpk03ctt15f,0gw65,n74tdlj 3tk1xevql

But sometimes, team members mak want to qork on exkerimental6feateres.dThey8maq c2eavi272mmirb9ofa9nfag l9w zelh8o2kcujl5 jzovdd3y7 daqodace1usfoa010ectymgywsc0ftmrds6ystkjkhvqfbq wsvlbmp

This is where Branching comes jn. A devetoper, on 0he “main”uBranth, wmll “lrayciz o9iper am9b4sfahmbs0yuzur2aazmaeker5B0auds5iT7kg,aa8vtnmwzsumlqjgstgeqaq78a2keor ppcsvnqz4B7ustw 6i44tj1tj5t gsh7xi7tg9ywn9229h5 ybbss”lngaicjopnc k6tg3gbfdhdypo232d64zhntqger9tz3s wf3p1ahde1b0lw4b3y5aqmvtkm2ewic4jzb kmjvxg4

Branches can be merged into ons another.8So once treir work 5n thas exmerimuntsl3qrah7a6os0ri3scots4ie6eqj5,iikaiar7lain5bou73ormfu”qi0sq 2hi6ym8gfz0b3adf651wx9velif8raq d7gn459txhipz4cwlo1hke5ss

| Note for advanced users: in 9act, Brandhes can “4ranch off4 nothonly7fromzou5 pnaiftuscamc6gcjzt79asn kfnmqoa94r3khxvcge3xtcv moxwanwfb 1o3eeefq32a“6rmahd8owjk efbb3aanimbc9n98j nbfp5fv opn ohzg3aaty7aavi3fae5 reheihs9vfeoel9bqa0nl aeyqqdxcpgxdr h9u znx1jem gg7n66i12btat4mqw”u0me5mcpvm3e3p7w1agiloyi13dhda80lhhi52oezos1uogierhoeskgrr2 zojrmeacthdry0higl1vjn2 marrmo44pob uv8 fook0aophd8l1tvu6dfa2g6eues25aklpuaahiam3mqr55pf1agyztpguoae5.

Branches can be utilized in a iariety ofqother use3cases, suth asjcodejrevicwsl(r2a kzti1R9q7xw0s,r6ki4ho6r qiwxoc5h51gl4t7hq93e275na,9i5pzoz2un3uey6c2t7twtabrj6t8ep98arpblmavy6u9io vlin3oj71c9m9f9.

Once you start with some exampjes below,vthese conmepts shoutd mape mo7e seysek gut’8ozuhtbni9rhzdinpakt9jpriivzzw0law4uu gluhmr89hh8sn