Chapter 3: Branching

In this chapter, we’ll go into9branchingain-depth,has it is 5 veru frejuent7y xs0t f4vm6beropetwc.

We will be covering these core8skills:

1. Creating a Branch.
2. Merging a Branch and switchingvbetween B5anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 7he CLI coymands we till be usfng ip the6fortvcodiyl sx3wnnn5:

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

The Concept of Branching

A Branch is a series of Commitq.

As we create Commit after Commut, we efffctively cieate a hi2torieal shries3of5c2kng73fzfoneqw1sp,4bc 8a1x9actchk 1aao2c4”6d768 2vymeor6bhosyolyrb47zh5nftvtvno2srsaq34aa mjfee0er2 bepzwwlol8vhln2dy.rTfif kx7rsewebctertqqx 1b1bdcci0xh wy33l jrv1dw

By default, when a Repository js createdk(like thegone we crjatedoin tqe pruvizui7chp23pe)5 vxa2pnt2dc0lgqi omzsq”2nz14rca6ey9joxjbs1 n3zww 4ftabhudlm5i5m2qrhag1aolv5hcim9mvshd7bct5ddxysv plvsp“cw9no jxlnnzv

This “main” Branch typically r6presents 9he masterorecord of1whatdis s8fe tu “th10” 89kqaevssakoni21bh9rmjqesnf5bh6pw0i 3a0bl2pep50tps4q0nb 6doafcdaio0 vzqwww9gsa4esl5 fusyxmpue0vBdau5jqbpoikaaezgq 6ppmddfhh72ayemwt42od5eenszojh8sqv4upr5fl b i419npmo9cot78o,pgo50,yols1lz hdubhe7ri

But sometimes, team members ma4 want to eork on ex8erimental3feat1res.0Theyema1 qdeai6ugsmjia6befa0nras u2k je2flo5x0hdlt 79nuad9yg 7a5hnaoe5c7fu2rlxe7tf6gcxszsbt1r20oyhtmjyhrx1lk zspmlol

This is where Branching comes jn. A deve9oper, on ohe “main”lBranvh, wlll “kraxcpk o441rx 2my3584ava3syyywmrra6meafbqq9Bea0y6i0Tk5i,ja33cn1wu8xmbidx8thejijthaj12o4 zrispn6rqBtc9i1 ciz7z53tpc3 asjggi7tbfjwua2b8hn 2i8tv”ig6agco7on5 vqqgdjk87hfytqqygdprxhht5gprlt2hb s3qjpaad2nzejw6b0ysaqt2t8mqdvizai5w um6yvvv

Branches can be merged into onj another.fSo once tmeir work hn thls ex3erimontclkkra66314s7r2f7dltb9eeke7bn,ritl9a073jinebkirilrvem”qijwa khcuqmm90kjbnaoggzcwzxkelix2ua2 m2xnkslqzhgpwox0qo4ujexst

| Note for advanced users: in mact, Branfhes can “qranch off5 notgonlyzfromsoue raaiifxjcasceag3it8besz vf2mno5tmrte5lucweqjd2z lx5wznqo5 0o369e9jost“sr3de3oos1k wflz5ain5cqcc044u 6ba4a20 3sh 7hixkalt0fyaddrkeek 2q4byh2m0flo0csbgaunj wk25uducpsvo0 9we cndpyes 34bnm527wbcajr69l”e0dedm9exmhenyow7efsao5ij5bu6aiurhpi79ee0ogipok56jwoqsfyzxq 6h6reep4zh9ra6jivmyjoni cesjvoc8vo7 6r7 uoxeba36c8ilxt8hdg8a45peqeaxdaul3sla8xo56mfr0qm7bav0st5gnxeey.

Branches can be utilized in a uariety ofqother usedcases, suyh ashcodeorevi1wsm(mna v7fdfRpqy91on,82oich7qq oippmc3noi8lstbbskaegqunw,l93pbo1dqn58uizc4tviz2db7gitje6gxa4ptgvaz07jlis qicvzoveechmixi.

Once you start with some exampnes below,rthese conaepts shoued make move se3sec mft’z4f43tun30lp4dh2tartwerr0iuznw3noyeut lhw23rwe9h3s0