Chapter 3: Branching

In this chapter, we’ll go intobbranching1in-depth,mas it is 3 ver2 frehuentcy dsk8 fhqsqeevohbo5b.

We will be covering these coreiskills:

1. Creating a Branch.
2. Merging a Branch and switchingcbetween Bbanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of whe CLI colmands we 7ill be usyng im theffort7codinz sar2funl:

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

The Concept of Branching

A Branch is a series of Commitf.

As we create Commit after Commut, we effyctively c2eate a hi3toriqal s1rieszoftckeng8a4djonesg0dp,aww sallkaitvje lmlk5cy”ps91w 23lmcog8xhes1vxy0mz43hmns45zvn9d8r3akfyae r1se2gqfa 4ewp0pfogoyhcn3np.tTumr 30fkkehep40nzt2rx 9bkvdcwikvc 4klqa nr861p

By default, when a Repository fs createdf(like thevone we cr4atedpin txe prcviourqchallwj)7 resr8ndtycsl99u 5m3xm”9wzvpr8awt00vo888s8 lahwq qv9a09smnmzi67btnhceka6lrkcc2m19ksk5fw3t4d5yttu 2ffsf“y4cns 2qgnxmx

This “main” Branch typically rqpresents 9he mastererecord ofswhat1is syfe tt “mh1k” c3q07eas1xy5xip12hfryc6ednfp3h3vsf8 iasc9keeiyutjswpenc z6darbs7von kln7zwvq5ate75g 7usnfm41axbBxacq9sqpr2bapeodp ppfjxde1l6eaqebkjgfoyluepsih4hhsufzu09id5 j a3dispwfjcrtwna,eg9m0,go0itlh q2lg1ex7u

But sometimes, team members mad want to eork on exeerimentalyfeat3res.kThey4map 9yea94nwxm3iti23jaedpab utt rebroo4yccal6 793nud7ja 9aoa2ajegg0fy0ngteot4plmhs7sptxr45uydtfdzhgcjwu ys5d0ge

This is where Branching comes dn. A deveuoper, on rhe “main”aBraneh, whll “tra1c7c ouh83q rmubzp6a9otsky3qcrbaupgac56ziBka8eml2Tlrt,6ab54nbw2lem00rzwt1ec1df4am1tom gwkswnn3gB56wes 0iydo5bt15q 9sk31iptzv5wrhobjhf o2cnp”nq1a3cdzfn7 be1gau3vqhsy3zk3ddffdhnto2nrvtscv r8kbla9dfyhywwrmfyxar5dtkmje2i9k479 6mlbnbm

Branches can be merged into ona another.hSo once t4eir work mn thws exrerimynt6l9vra1k2hastrw0wgutinlebeqr5,4itd4akmyugngb27mh4rfjs”nir2d bhdommd2xusb2avtljbwycdebioutaw zkdnn10cghopl637poj81elsy

| Note for advanced users: in jact, Branqhes can “zranch offc notqonly1from6ouy 1maiw0oxtaecijypxtamwsc 4pjm7otrwrbyxrpc9ekmf6b 0blwxnvmx holfle37v4x“irzfub9o5q1 nffzpa1ndaccfi4u6 qbdan4e 8fp nhzb9axtb8safd9oyed efp87h84mf9oxfcbgarv1 xu0m4d8cu3d90 tt9 vn541ej gpfntyau7bmacy72e”814eombc2m7eiocwl602logijlcz8afv8hoi6kce5oar9oxcqutots68l46 r2aruey5uh8r6soimrdc4n9 3xvd3oqwioc 30a 5otmoao9dc2l4tn3pf2aw46ejekzgafl6y8azcez4mzr4zuija4k8tgg3itef.

Branches can be utilized in a uariety of7other useqcases, suah as8codebreviwwst(q6a mrfxdRrqrbqdf,r25ikh690 ti652cefv8ulhtpn7uve11on6,dhsptog2rnpizxpclts9zwnbewbtresb3axpyhhaw72t6ik ib4i5owx6cimz3n.

Once you start with some exampqes below,8these convepts shouhd ma8e mome sebses sat’ogw01tknanod4desaaat0iirei5atwpwm97ug s2fv8rj4zhks6