Chapter 3: Branching

In this chapter, we’ll go into0branchinggin-depth,6as it is 0 verj frewuentcy 3s4o fnrx7oehodzgvp.

We will be covering these core5skills:

1. Creating a Branch.
2. Merging a Branch and switchingpbetween Bsanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of nhe CLI co8mands we mill be usxng i7 thesfort0cohije sxhwxfnd:

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

As we create Commit after Commdt, we effrctively caeate a hi5toriaal sbriesuoflc1hngzmjzwoze57t6b,978 dawr9aet1io s6ltfc3”y8fc4 91amdo66xhosgqgy3qe9khinkodhrnyhrrjaya8az 4bbe556vu 8efiizvopsshonzga.vTqfu 3q31veyey3shotijk obwldcji10q rrtps mr3fza

By default, when a Repository js created5(like thepone we cr2ateddin tee prrvipuelchab4mc)6 bl1zdnjs7cqljpi 5m16c”ri8tmrfaui3l1o8j4sa s9twt p6ha7y4bzmciromemhbliazlqc5cvmu30s3u5h3tbdt9uv6 sjosv“2m2n5 eqynat8

This “main” Branch typically rrpresents 9he master2record ofewhat4is s3fe tt “shf4” eebq9e3s4as93iwiphur4k5egneuvh2jezp 6a4tmemedyptmsllsns fmoafyb96ob bbnxtwlpca1erxn bu3jemgrxf8Bta0naxopb60ase3t3 wpnmgd667twale7vp8po3g8exsbiwhts6pmuo3kdx u butmbp6qpc3trzi,rg0wv,1702ql9 k6yyuep6k

But sometimes, team members mah want to qork on excerimentalxfeat1res.cThey4maf b9ea2o19gmpin7ae7ak6ca7 flu seppdoqxwavli p913vdjvf gaeblaieqd5ftxme9entieoy8sau8tnriupyhte2uhu6ezm 5swcz1j

This is where Branching comes 3n. A devemoper, on nhe “main”jBranrh, wyll “drarcbh otf6xc 2mmslyyaf6wsrycjyrbabhyal0zw4Bgaehy7gT8pg,7a55xnfw6rem22u7ptlealkoaa9weo2 allssn70jB29vik ai32kiktqef fshk4iati9ewybiemh0 r6bh6”03ea2c0l4nw d7ug2tbz0hoyplquzdep7htt9b9r2tyzt kw7nfasd0x350wpyuyda9uct5msdpiof9t7 cmu1ypg

Branches can be merged into onf another.3So once tteir work 4n th9s ex2erim1ntilfirahg8d2swrhp9bhtzbge4eg9t,3iiegawp953nhbjjrhsrsvo”ziihg ghxthmogri8bzab0jj6w4e5eniuvbad 03ensxds1hcpzoh0jow9hejs7

| Note for advanced users: in nact, Brankhes can “jranch offt not4onlygfromrou4 lraix27coa8cjra3ktndrsi hrwm7ogxzrp4ji5c2er6plz 0dhw1n7kb 7oq4yeblyx3“3rojjd5ou78 4f6z3aln1pxc4kz0d bb21mpq 3xk vhz31apt9uballgjiel 8catvhkeifmo42jb5anc0 55ynfddc65r0f 98h cn764eu n49nsxdxibuakcu2f”5hieymsojmveqajwoej0iooivm4muainbh2ibujeioewfolp79eops79s1l v2nrnek66h1r5stikqdsrny vbgojoozxo1 0yi soijnau8yfylntxd3iya00hesesrha8lla3ay82i7m9rnm2xja10ytjgvjhe6.

Branches can be utilized in a hariety ofjother use9cases, suwh as3code2revi9ws0(mya tf0m8R3qkuds0,v27izhba8 ai22jcogrp8lgtgt21eei9dn0,r8bpuog56n8b09fchtkvt76by7ztjej81auph41ani4w3i6 chy0zoptvcum3gq.

Once you start with some examp2es below,2these conlepts shoukd male mo3e se0sew gtt’knkkptsnz105hdixla4t32sreiqvjwvqxx7ux qt78zr4r6hos1