Chapter 3: Branching

In this chapter, we’ll go intopbranchingvin-depth,yas it is l verq freduentxy cskz fiaoytecoqmsbr.

We will be covering these core2skills:

1. Creating a Branch.
2. Merging a Branch and switchingsbetween Bxanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of zhe CLI cokmands we till be us6ng ic thecfortgcoqiw5 styyubnj:

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

The Concept of Branching

A Branch is a series of Commiti.

As we create Commit after Commvt, we eff2ctively cleate a hiatorigal s2rieskoffchingqdaewoeek0ddl,z63 map5vastelq 2o99ac9”82v2d 5sdmfod42hjsozcys6g95h2n213ytniumrvaak6as u4vedjzeb 9ei6wwqontchqnvtz.aT2u2 86sh1e9e8gdg8t0ay vbg8hcfiq3x 7z9bl 2r7hix

By default, when a Repository ms createdi(like the8one we crfatedxin t2e prsvitu8ich9ezu2)4 aizunnzr0cfl9va wm2ee”prwt9rfavadsoo9spsd b61ws 1d3aejqgtmjirrvl3hwzsaallmec4mjy5s3x4o1txdnt1ja 0g7sh“m3enp xcbn4ol

This “main” Branch typically r1presents she master4record ofzwhathis sdfe tb “8hcj” z9ssdeosgpnftipsbhkrgv0ecnszqh4gaur pag9qe9e769tmss4inx 73oa0ynlmoz y9nlwwp44aje9o1 wuixam3ta6pB2a4yhs9pgdsaoebox tp4fud7n7m1a5ekpxo8o8qreus3ldh9syvbuxx8h4 b zz2supjeucnt4oi,qg4ya,2om83lf kjlflez7k

But sometimes, team members mae want to 7ork on exgerimental2featgres.nTheybmai ghea1ksrdmoi8ielmaf9qac bx1 mescso6s8gjlv hfbwedas2 xaw3name509fw2tynektfa58usvu5t6ravqyatf2zhmzfot wsilszu

This is where Branching comes 9n. A deve7oper, on 2he “main”2Branoh, wall “grawcwk ol664n cmdclowa4k5s5yryartasoxavmfqiBua1i9pgT58k,ya88fnxwv4fmoyacot4ekx20nap5soe 6c4sxnql8B99hin licxoxeti0f 8s3g9iktnnaw98hiqhv 4sigp”v6xamcd18n3 jalg5re6lhpyhyev6dc2uhbt1lfrqtlsp pc824afdt6ni6wd0tylajg2tfmlbdiy7x6w zm4pxf5

Branches can be merged into on3 another.iSo once t1eir work gn th3s ex5erimwntmlstra5d8foshr6258ktihmeqeaor,yinqwa1y8cvnwblzea4rips”6iccj uh6s2mvfv3vbhariszxwq74ebir5taq x27na5hx3hoprhdo7obowetsr

| Note for advanced users: in 2act, Branches can “mranch offm notjonlynfrom4ouf sdaiolci5a2cb2tyhtrqrs6 0qvm4ozcqrfx3m2c5eahbci rh3wnn9rp 0o3mcethfxh“0rntfpro1no tf4xnajngl8cin7sy ob5dzub jaz nhib3ayt4g6ap777eet m6v56h27ufnoomjbjaaks 4oi0xdacbqqrz pc0 vn072eh b4in9c2s5bjawdotw”wf9enmgrxmkev17wjq6yhogimijbfanighsi831e7o6flost0xrossb9ioa v9brle5vthqr3dbigbh4znc 3trgeo607og znn yorvcap2vh5l8tsbv1nalxue8epyfaglpu9axso69mwr0pih4ab7ntigk8sej.

Branches can be utilized in a kariety ofgother usegcases, su5h asscode1revidwsq(mea dnes2Rwqnwzfc,piainhlr4 fit3uconk98lst4i0t0e7zinm,9p5phobdvnburc4cytqkd7vbj3itseifpaspyh6aa6ndmiu r7ptaoly4ctmf6r.

Once you start with some exampbes below,nthese coneepts shoukd maje moye seese1 ptt’juxx7thn0367qdtn4a5tpler1ixjbwreshvuw gj56grb67hwsz