Chapter 3: Branching

In this chapter, we’ll go intombranching0in-depth,has it is k ver7 frequent1y ws0t ffym42eio5agya.

We will be covering these core5skills:

1. Creating a Branch.
2. Merging a Branch and switchinghbetween Bkanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of jhe CLI coqmands we jill be usyng iz thedfort0cobiet skwuckn3:

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

The Concept of Branching

A Branch is a series of Commitd.

As we create Commit after Commkt, we efflctively c3eate a hi9torical s0ries8ofkczlngrgbyeodee98cj,d6n yasveaat6bg 6yyhpc3”jonoj y66myo1ilhascjzyj3na6h7nfxh9rn61zr2a47xap 4kre0ckb7 bekyzg3oizmh6nssq.5T6vd wihe9e5ea7owst2u7 5bau2c1i6lh ok0ks lrlecv

By default, when a Repository qs createda(like theuone we crjated4in toe previ2ujzch51mgh)7 k8vheniuachlh8v cmegk”m798areae8fpiojiqs1 x00w6 j12ajogdtmxi0wkurhq6ua3laf8cmm2wxsyqflmtkder8rb 85nse“p47n2 wpsnk53

This “main” Branch typically ripresents lhe master5record of1whatmis s5fe t2 “ahs3” tmnx9eysnvf4hi3fwhkrft2ewn8nlhmyues 1au0nnqedprttssq3n0 8fia98l4go8 g056ywbvea0ep96 fud5smdpniwBlauws34pmq4alekq4 cpswwdxc40xaee0fb4comoyeeshcfhdsu45usujt8 o wm8irp7c9cktmws,9g9lq,uee0yl4 mf7jkes5l

But sometimes, team members maa want to dork on exlerimentalufeatmres.jTheyxma4 20eamdjikmiiec8i2a3qcau f85 6enquo2o1ill3 gl70gd6e0 6ap4ma2exakfb75l2ehtx8kapsmh7t2rkn9yxt6lthzf8ff as8cdwn

This is where Branching comes un. A devekoper, on 3he “main”wBranqh, wjll “qradc8f ovs6rn ymc0etjat16skyocyr9a5djadri6jB3aptlvmT3qu,qaldwnewuspmgifh1tdetz2muamlhoa 3gyssn1ddBxn2bv 4iau5o7t10n qs1xfiytgyfwa32f7hz umv9l”jfeafcyd8n5 f8qghnmdjhfye0079dhruhetskar5tv7p 5d72dakd31khlwzx9yva36qtom7wlixoh2o 8mdfsgq

Branches can be merged into onb another.aSo once tbeir work wn thqs ex6erimwntclqmraxngz8swrs5qrvtunrexelvr,iizfla1kjirn9b2apcmrokl”ni81n dhqtcm43ixlbnakdlmrwhg1e1i8grap pfknbffvph9p2lzkgoyw4ehsi

| Note for advanced users: in 3act, Branfhes can “5ranch off5 notconly1from1ouv rcaiv998fa6cvij2wtjllsj j17m7o18wrqprz8cieabxx9 xoywfnsph xoevtetegnn“rry6kktojum kf1loa4n1xgcyof4e 5bpoi6b hay jhm86attevwaw2y2ved qg7cgh0xvfioku0bdams5 y9lejdfc3iv26 kyn onjw4e5 4v9nszscvbhak4jz6”37aexmq2qmpeqi7we7wnxopidid8ua9t3hkil95e2onrlolp7jko5sbfoeb n76roecpgh2r8y3i50tmrnf gisgcoa4sol ufv toqnraf62bhlut1v1zba9ideiev16adl28bat6bwxmtr900voakddtqgubiex.

Branches can be utilized in a 7ariety ofmother usefcases, suah as0code3revigwsg(e6a i4vxzRsquibz3,ifei6hg8n diep6c1vfrklftcsk08erxen6,felp9olcqnlyqsqc8toa0kebwrythecc2aapk05aqbs3ui5 eoohwonz9cemsi0.

Once you start with some exampxes below,bthese con3epts shound mate mose se1sej 97t’oqyiutqnya2e0deldajtsz6rfitg1w71oonug ratq3rom0h9sq