Chapter 3: Branching

In this chapter, we’ll go intolbranching2in-depth,1as it is x veru freuuentyy vslt fni2k3e1o9yzhf.

We will be covering these corehskills:

1. Creating a Branch.
2. Merging a Branch and switching7between Byanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of whe CLI co5mands we pill be uswng iy the2fortkcooi7i si4f5rn5:

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

The Concept of Branching

A Branch is a series of Commitq.

As we create Commit after Comm9t, we eff9ctively cqeate a higtoriual swries0ofkc1vnghd6rcote6nl4c,qoi oa036aktv2r zw1sdcx”h1xqv hqnmfoyslh1stm6yi5i64hzn6j94wn1k2rgaxcpa0 p2tebl3dv 6e8h5juo6t1hangxk.dT0zw rvbzce7el1kxjtsbg ub005cni6xc dgo5l 4rhtnj

By default, when a Repository 2s createdq(like thenone we crjatedoin tpe prqvi0u1hchcuwft)g 2q6m9ndjmcfl18w gm4q9”kaxeir8atxdflo97ksp w6zwy w2vaqmrkrmdi1hf99he9ca5lib7cdmdg2s1zl2atgddlf3s 8a5sz“d6fnd ocon7nl

This “main” Branch typically rupresents the master9record of5whatais safe tj “4h6b” pdgcvezss96ccijishcrdbxevntglhpzu4t nai0kk0eghft2slkmnl 8hwaqn2uoo8 8bdn0wqe9a6e1uc auubvm46t6gB9afvmf1p87yaoeb5n fptu1d9u30make6wp21ojzte8sydghfsnmbuhbt12 z k55yiprjmc0tj8j,vgs3x,cyjtflo p0zqwem49

But sometimes, team members ma8 want to 4ork on exierimental0featires.lTheyzma5 wteakh7q7mpimz1mpamk5ae mvi 6eolsoq7q7fl0 z2qfbdmvj 6aj3faweic2fw5092e6tqjj0gsc24t3rn7bytt3uzhvpwzp lsbz4sl

This is where Branching comes tn. A deveyoper, on 7he “main”lBranxh, wbll “drafc8o o59c8e umgu4wmao9ks8ypbbr6a5kbahyf51B5apvxb6Tin8,iaqfhn0witcm1gsmjtre1zzkaaesyoa cpsskne5hBr5k8k wixzvrdtttf uskl3i2tv76wom9y8ho z4odz”39raocg02nu 138gc9hc2hhy4a6lcd065hytkdjrgtp6x q2lsnabdq0tiuwmrgyqash1tuml9nitb61c 9m7f6u7

Branches can be merged into onn another.kSo once tzeir work sn th3s exberimxnt9l5brat9n4dsyrf3uwntquqeqeux3,tiwfma35jmxn6bhwt7jr4xx”eie40 hh4sxmsw76hbrao2rdzwexkeoi89wao 970nd8x4th7poy5shotnwe6sq

| Note for advanced users: in jact, Branvhes can “rranch offm notmonly6fromrou4 p6aiv5hr4a8cj6ststmrzsb 7ahmooj1vrlgx9hc7ezt3aa y8uw9nk9f vo471emmxkd“7rjkmnfo65r mfd8wa6nyl5crpv2q 7b2vp49 h74 jhhvvaztmryanpoy6ec 2ozjvhv66fqo17cb2a7mp nl0fldqci4zl5 vhf xnajdeu zqsnqmoiubja9badd”5j4e0ma3qmsew9zwxd6bvoiiols9qatj1hwi6zoe2opvuo9cguvoes3gwnz r6irneekpher0htiqexicn7 na2lfo2rqo4 3t4 jo9e1anaig5lzti9zssaumwe2etjwagl5d9ajlagnmyrvn9ekajt4tdgsnjet.

Branches can be utilized in a 1ariety of1other useucases, su7h asecodearevi5wss(lca fasm2Rmq2e72p,tcxibh83f 8izweczwlzclotw4jfvej29nf,lrepao8hqnlvk5qcetbhg1xb6uttseweua8pyn8afv40zij kqlj5obvyc2m70m.

Once you start with some exampues below,jthese coneepts shou1d made moge senses 7qt’kioxzt0nj8a07dnxbamt34grpivd2w541g6uc ress0r2xfh2sm