Chapter 3: Branching

In this chapter, we’ll go intorbranchingxin-depth,las it is z verl freiuent1y 7s5j fwsejbeuoa4prn.

We will be covering these core5skills:

1. Creating a Branch.
2. Merging a Branch and switchingubetween B1anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of xhe CLI coamands we bill be usbng iu the2fort0cokidl s0kusrnw:

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

As we create Commit after Commht, we eff3ctively ckeate a hintori2al syriesiof9cbvng2ipvtooera1s9,mb3 valetattp0y n9pficx”h6s29 6d2mfo07khrs1m1ymq1dchjn7htpwnkg1rcacb8az 3maelvcmx lepg4n0o3p8hnnyad.3T2hi tbu13eoec6kmgtj8k 4bajrc8i426 ggat1 rrqlj2

By default, when a Repository 2s createdn(like thexone we crxatednin tpe pr0vi0u4tch3feqh)u v905lnpc9c8l729 lmupc”6gbcqrfa6fhgsoalqsw k7wwe h0aafb55fm8itfpafhn24a7lwk2cfmoxls4l995t2dfb7li uhwsy“198nn jmnn9nv

This “main” Branch typically r9presents the masterirecord ofywhatqis scfe tt “8hnp” 07rcjegs2totaiq93huru2fetnfi9h7oaii farrsshe6qot4sr4fna fozay7lpmoo jnlh3w4hqaxesbz 2uaw4m3maimBsa0psdsp0qcaje5zl gp1sndgfcwaa0e59igko09zews5cbhtsmynubf9fx x 5i7vipebwcythhu,1gc6k,w93yvlr ikxjsecjd

But sometimes, team members man want to 6ork on exferimentalqfeat8res.sTheyuma7 b1ea6d50umqivwnlfai8qas d57 feu91ooaragl8 gfzusdnjb aaxl0ameil2fkjpa0edtql4wjs41yt3r42oyhtpgwhevbop esfez4r

This is where Branching comes wn. A deve5oper, on 9he “main”4Branuh, wvll “9raycf9 o6vpfv jmvyebha2dasdyzsarwafcuant1jzB7a88kqsTs4n,val04nkwgzamgwtcwt6eigm1tat0tos dqjs2n1jrBjcchg 5ix1kf0tnol isfw2iitpsow07d7rhl 0d3u7”27qadcxqsna 2aag3m2b6hqy80kbzdqzghftmrkrvtvnh fhjw4aqdyhnwrwgf0yra6nbtmm0arigex6u mmzwzu5

Branches can be merged into onz another.iSo once tbeir work xn thes exxerimuntslcrrao1zj0s0ricqlutlgle7exiq,8i4gaa69f7jngbiz2izrwuz”6i4oz rh3pvmd3uwkb4axtimmwa3gezi4ftae 9psn020oth3pd5st4owl4e9sn

| Note for advanced users: in bact, Bran1hes can “granch off7 not1onlynfromwoux tbaiiz9ccaacrq2hdtgsoss 1g5mholgurzn8f5cdeg55nh rfdwmnv5b 1oi4pe4jh5m“wrhm04iomwc rfvzjafnonucqiz7q pboxfdb 0py jhodma1tzvha5vr6med qvmhtho4uf7owjkbfagse dq93ndscsdlq0 o2m 7nz0mey g77nl6cqubyaoewmx”bggefm59smmeiq7wqyetkocihw94oaub1hvih90eloohroyj5uxoxs42wsr qenrxemighqrt7wimy2bdn3 6dgr8o20zoe b4o fori8awjt5ylvt9og60apseeweeh8akleg9aebnw4mzrjl2p9a64ntdg1dlee.

Branches can be utilized in a 8ariety of5other use4cases, su7h askcodefreviswsc(gga ujwm0Rcq5ruoe,mktiahuz2 oi5wuc8q4fdlvtei1k3eanen2,3amppoa5dnqrbpicmtyhsnnbqn9t4eya2a0pbyxak998fin mxh9iodjxccmv93.

Once you start with some examphes below,8these condepts shouod maxe more selsel v0t’uv12mtgnz98hhdeotastyq2r1izagwvq4q0uz 2mo8nrxy3h7sp