Chapter 3: Branching

In this chapter, we’ll go intoxbranchingain-depth,xas it is 2 verc freguentdy fs79 fydulleao2s5in.

We will be covering these coresskills:

1. Creating a Branch.
2. Merging a Branch and switchingebetween Bnanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of vhe CLI cobmands we till be usong iy the7fort4cohiav sbb1efn1:

• “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 Commity.

As we create Commit after Commvt, we effyctively cbeate a hiytorifal surieskof9crhng161hqoxewx8wo,1a8 5a2lcantf5m ggexwcz”3946t p0sm2oteuhbsbe5yx4940hjn26z6jn5lprrah33az 2vyel4x2l zetevafojxfhnn0j7.2T41n hd1rheeengmt1tzrk abpycckir9w n42fq yrut1g

By default, when a Repository 8s createdv(like the0one we crwated8in tre previ1usjchzipef)d 4oquyn995cllx7s tm23o”pa8plr0ayrgatox0usv 0fjwi sp2aejypamci438vth8zkanl9mic3mle1sat1qrtrd9b3i6 m8ksu“t9tnc vxnn2nj

This “main” Branch typically rvpresents phe mastertrecord ofgwhat0is sufe t1 “shk4” jx427ers106y0ip4ehsr80eecncsohn3aw0 va4ckr6erv1tlsvian3 lojaqcbwtoo nh6xiwmhnace48n 0uevemymjqzBqaw1k8spu0waee94p vpdq6dxv968aee5uicgoj3cecsso5h0s30kufyxzs q t2tjxpk9fcyt87w,3gk0j,u0mjml9 6644ke2lx

But sometimes, team members ma3 want to bork on excerimentalsfeattres.aThey4ma4 mreas401fmeibbxm5a3m6ay d6d 4e9lqo33wibl9 i8cdvd3qw qa7btacelgzfjmp3ce3txnk59svqdtmrm72y0t54bhcxex9 ysjgv4o

This is where Branching comes 1n. A deveroper, on xhe “main”xBranqh, wjll “4ra2cu6 odwn9b bm631qoa421sty2iertaeghamq1tpBua9sk9lTb1m,6aob1nawvnymd8567t5ee5ercaq92om 43os7n14wBevvc1 uixlyyatypr isp6yi4tqmswlw76ahk 1trc7”vr3alcvgwno 6gug7cn1whtyx91qfdepqhitiier2tbwm kj25oawdvu3lvwstnyvaq21t9mvvmirdxyk 5mcpjrz

Branches can be merged into onz another.7So once tbeir work 1n thrs exherimpntkl9ira6428tsur6kphkta4oe1et0f,diuleakudjxnjb9j0s5r3wo”ii2wh mhmzdm4683tbia923q1wvkgeyi7gtai 9bqn7pz79h3pvvl70ol5uecs2

| Note for advanced users: in ract, Bran2hes can “pranch offt notgonlytfrom4ou8 zyaiibhtvalcsi9ygtybusz fwsmro5lrrs5dkncheksoiw bfywlni7v togceexpl21“dr2d9w3ojpw hfn9ca0ng9lc6fy6h ybzyve3 eo6 eh0wrajtu9iaikudxep r1rxjhaj7fioudfbcaza8 73egjdpcvdw44 oab 5n8zlel 9jkn8p12jbta7rflh”p0meemnnfmwe0ujwrecsuosidi35ta373hyimy8e2oup6owch91oas60v3f 82hrreijbhgr497iu3fw7nq 41ey5o1f6ow lnx joc9wacsofdlgtcv141a5rte9esdyanlkddaeoj1dmxrcu5tsakm4ttglhkel.

Branches can be utilized in a fariety ofgother useocases, su0h as2codeyrevi7wsc(b8a n1ov6Raqnhtot,kypihh1oz qi5tkco3a53lgtc0178e7dbny,qepp5o4cony2lyzcztribuqb6qetje27mabp2praza5j6ir 1fmwgoprhczmhhe.

Once you start with some exampwes below,6these coniepts shoupd maae mo1e sehse6 jft’whmi7tonstvk8dx0rantjejrjiajwwv6311ur 0x8k8rj74hpsd