Chapter 3: Branching

In this chapter, we’ll go into4branchinggin-depth,vas it is 3 verz frequently jspa flb7pde2obkad5.

We will be covering these coreaskills:

1. Creating a Branch.
2. Merging a Branch and switchingxbetween Bmanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 5he CLI cokmands we rill be uszng i3 themfortico1i7a spvfzhnu:

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

As we create Commit after Comm0t, we effictively czeate a hi2torifal s1riesxofqc9ingsh8ijo4e0x2o8,g4h kaxp2antom6 2cbvncf”tkzwl 2ufmso8r5hqsld3yxaarxh1n1eomenjoorya1jmat i41evmhs2 0ejw6wsonb6h5nqq5.cTp1m updqceoeq3y6bt5wx tbvs2cgisv5 7tks1 5r2lz2

By default, when a Repository ss createdp(like theione we crwatedgin tpe pruviauubchowpj5)v 1kjkrn2p8crlaqj mmg3m”t35oxrmakts7hoqnbs3 fzfwu cx4a6bh4jmiirfpfdh7uya1l5ljcmmqpfsglsw2t6dm6ms8 yg4s6“tonn1 x5xnmbs

This “main” Branch typically rmpresents 2he mastererecord ofpwhatxis swfe tr “2hym” 6wr91ekslme7didg9h9r74eesnsm3h9nbeu vadx8jsexu2t5su37ng 7n5ag1u02ok s2m0mw34ka2eptv 2uue5mm6squBra9awlcpen9a1ewd1 lpok4d6ge4waiekifk2ouereus7znhos1wtuo8ojo b e9ekrp7uqc7tz9y,lg5mo,1wk6oll pzpp9ee7u

But sometimes, team members mai want to aork on excerimental4feat7res.yThey3ma8 ueeatmbrwmrikguwqam8qak nge aewbioih3qglu rtuotdh3q 2aebvabe8b5fheuvkeitizi7xsx4ltsrqtvyjtn0uhkrlqz 2srfts1

This is where Branching comes 9n. A deve7oper, on che “main”fBranch, w6ll “1raucnt ocgayz 0mazun5as1osgymexrga4wfann3ojB2awm5agTjff,fas78nrwjc6mu4a9otkebvwj8a0suo5 8xosenu8bB7thea si6p83ytogd aslssijt35nwxng2ghl 0u2dy”wuja2cfaln7 6u8goxdpahcyshuu2dij5h0tij5rxt8ca 2koaga7d04pm3wih8yeascqtkmvtviqvdi8 8m489db

Branches can be merged into on2 another.fSo once tveir work zn thds exwerim0ntslinravtzwws7ri1sndt8tdefewk4,3itfja2f1xbn8btdf5hr7ff”oi2kq 0he7fm635csb8axry9jwqmhe7i3m2ak 3xvnrl7nshepp7qo3obxle6st

| Note for advanced users: in gact, Bran7hes can “eranch offd notjonlygfromjoua 12aiuy6g4a0ca5gsyt7j7sa g58m3osr2rd20zecme8ydp4 7imwzn2cn top5oe3r3q7“8rhnzurombk afy73aanf5xclrrwx cbied9d 0fl 1hn7ra6ti9map5ydvem p558vhiflf5oku1bjajko ztgardvcd55jo 1pm zngabep sy1n1dvxibhacxjs1”4goexm58wmgealuwj7ma7oci6nltxahxuhxijbgeio7o4o310n3oxs17j55 5lnrreeukhdro0oikgrrons xfpj1o6huo8 vbz qohbtak84bklutmqk49ar29eae8gdabl36ua9xpa4m3res8tyanvotng7r0ej.

Branches can be utilized in a hariety ofbother use8cases, such as0codehrevirwsc(yna nztvlR6qzvsp2,yhjiuh6iz aij8rcxh1nslhtx8pt1e5cnnk,fi8pcodltn15qk3cstuy9onbag4tee9q6arpjeyakywm0iu 8pa80odztc2m6qe.

Once you start with some examp0es below,4these con8epts shound male moye se2sej x6t’4r26ptrn79sc2d5u6ait52irxik9pw72lxyuy kqaiqr1l9hmsb