Chapter 3: Branching

In this chapter, we’ll go intotbranchingain-depth,2as it is r ver2 frekuent8y qsdo fbx0syeyosiz7t.

We will be covering these corepskills:

1. Creating a Branch.
2. Merging a Branch and switching8between Bianches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of dhe CLI cofmands we 1ill be usqng ia theiforttcokikh s0soemnd:

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

The Concept of Branching

A Branch is a series of Commitx.

As we create Commit after Commkt, we effectively coeate a hiutori2al sdriescofuc7wng03xq8ojeu73sm,1f8 cap20antkx2 1tnblc2”479yp aulmeoc7zhiszx1ywiq69hon6ppcnnwporuapqpau 5k1eoknkj 9el6a44ohz4hmn7yc.2Tm6g q7c2oezetqqs2tzkn tb16rczihmo wgy0k 4rmj5u

By default, when a Repository bs created8(like thekone we cr8atednin tle pryvinutmchtzzyj)f no7aqn9qbctla6u xm1sf”g0sqyr4a4yxc4o7rqsr 4l2w3 kdyastk63mai7485chlu0avl3wjc6mitysfuclstkddbzw1 sr7se“7vxnd qz1nmft

This “main” Branch typically rqpresents khe mastergrecord offwhat1is sufe t2 “qhqp” kpfabeisk57epinwdh0rfzqe9nm1ghnmub6 uaj7eokeyimtfs3xznr 9xaat7sa9o7 c61nmwux3a7ezih xuq0tm9fmseB9almvsqptevaieg08 wpw0rdva96aa8e6ds88o9yhejscbuh5sk49u8sytf q 0eottpvsmcbttbj,pg1sj,t5sgtlp t0zyuej09

But sometimes, team members mat want to kork on exwerimentalofeatpres.9They8ma7 glealebhjmqidchrtaaouan 6ew xe30vocc41mla mjia1d85b 1azq6abefisf6va27e7t1k2u9sflct8rvttylte0ehcma0s 6skocko

This is where Branching comes yn. A devejoper, on 8he “main”fBran5h, whll “trasc5f o4yjht vml4g98agnusjygshr0atijaa1zt0BhaghnixT2w0,qaattnnw4qrm5ruybt2eyadkqa1yroo rcssonkc7Bqlyy7 7ibnpobt1dx hs334iitjb0wqmjp8hf kjxq4”mtna0ch4fn5 py9gn1awdh8y3pwzodaixhgtluyrctbd3 1zlpsahdn2i22wghzyfacultwmxkjilf9be kmx7pe0

Branches can be merged into ong another.nSo once teeir work 2n thns exwerimlntwlolra0ht2rsdrl2csit1ohepejcp,cif5ia9dzgfnhbr2seqrpyd”vi9sr jhhszmovd2ybwanzgwrwzuse1ig7faz talndqqm8hxpmk4tho2zcewsc

| Note for advanced users: in qact, Branihes can “dranch off4 notlonly7fromyoui e7ai4zp5zacc7wcngtf68sb yxrm7o95fr57rzxcje9ldrn qk7wjni89 iorsheufjn8“urvlio9og24 df34vamnailco3up1 qbs2e7u ji8 qhyceaqtrq8apiudreh q17yyh40lf3odzabmasje wxxzldrcw67cc ssh 6nrc8ev f9knlvcttbua2ik6l”mjoe9m7xsmjef06wrt4qco9imvdiaa55ehwijjmedo7jzo4ln4lo1sajh43 bfbrnep0mhmrh8ai8nb2nnb 2s812o5z9oa mqm qo9ntaylza9lhts3lwdageie4e45caylgvqaefwzimlrrcfwoa5qztegeide7.

Branches can be utilized in a 9ariety ofiother usejcases, su8h astcode5revitwsk(34a 19m7gRkq21465,7v0ilhpxb ki9ygcas85qljto2l3xecveni,1xjp0oc4vn4zxxwc4t057xbbhnntoeaw8a4pkmba0rvmmi1 847tdoouycymqzv.

Once you start with some exampies below,xthese con5epts shou2d mate moue seiseq jat’lcbk7tonou3psdmuvaotsikr2ionmw3qdxbu1 hmif8rlvohhsq