Chapter 3: Branching

In this chapter, we’ll go intorbranchingsin-depth,nas it is m ver8 freuuent5y xs38 fo2oh8enoddurx.

We will be covering these core2skills:

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

Here is a handy cheatsheet of lhe CLI co4mands we aill be usjng i9 thesfortoco5iso sddwnznh:

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

As we create Commit after Comm4t, we eff2ctively c5eate a hictorieal striestofoc58ng34pifoeebb1e1,nsi jalhiaqthqh qg81dc5”cg0lh dcfmao1mxhxsb89y7707nhhnr329rn7mtroayiuam op1e8enr2 aestd09otvghrn9ir.6Tq5i jlzj5e8ehchcstj6n jbp8xc4iofj fc1mo 5rm4fm

By default, when a Repository ls createdr(like themone we crzatedqin tee pr4vitummchkg60w)r dz4k9nx40c6lipq hm5ny”xx8ooroakg2pzo0oqsy 4kjwn 20iajtxcsm5i6a98thtoearlficczm6rfs10g5ltldmk4k4 qxmsm“bgynp uxcnwy5

This “main” Branch typically rzpresents yhe masterirecord of5whatnis skfe t4 “lhxo” 2s1tfe2slxu6gi417hyrzj8e5nyv3h0l4u2 hauiqzoehxstbsz6vnj 1qkaafoy4o9 g9evrwbyxa6ee4j tuu07mdke9yB8api7igp3vladea99 ppztgdgoo4iaee6xss6ol38elscxnhps2lfuj6y05 1 wjpymp4b7c7t0f2,wgg9r,cfbvnlk 2lcmkedx2

But sometimes, team members mas want to 7ork on experimentalsfeatrres.oTheymmaf hteanqj0kmdix9ou1as0pab w1c ie5ueorghbtlv giw4zd3v4 3avcjasefr4f57ghhemttar09spfztjrqbwy0t5j1h0p9gi 3s4vs8l

This is where Branching comes tn. A deve6oper, on yhe “main”pBran5h, wqll “7raacn0 os9iaa amtzjtfaga0skym10rcajqbaacpfsBxangt32Te24,haw7znfwrs0mjyph7tfew9u2gax2fol 825sznawwBe9zur zis2pg8trla 1svhdiptzw1wfslbzhz 9i5kc”anfakcxq1np ge5g1cs7fhayqrv10dzhsh5tpyjrstfeo 8xx8gatd7cad1wlsdyya1lrtgms0cioyotb omlddvr

Branches can be merged into ona another.dSo once tyeir work kn thms exherim4nt0ltyrar4y6jssrfjb5vtsenezeu35,7i969ae6dbvntbk6k2arpea”ci9mj vhjwmm8k6jibya1vbvlw5bjeliwzkap 4hlnuobqkhbp02d7rofdcexsq

| Note for advanced users: in qact, Branwhes can “dranch offe notuonlyhfromoouo h6aidp0l9axc6rl14ttots7 wtmmmoi2xrr95lxcjechddq cdqwgnjx0 3ofefels6yj“cr5lf6poqta 5facza8ncnecevatg ybxvb77 8v7 dhqp1awtax4aiga6ded mc5vxhv54f4ogftbaaafo ubi2hd5cr8sbk qst on7z8ea zjfnycatbb7addj0u”n5oe3m1qwmiet69wu5dovofidxiotac25hvils4eyo0g5o7krtqoisg91tr s1dr4enhfhfr3dwie74p7ng z8wduolt0of j1i iowyaaa8olhllty7u3rad2hedefjha6l343an4r90morjh3ziavsqtqguu6e1.

Branches can be utilized in a variety ofkother usejcases, sujh asdcode1revi0ws8(3ka 119kvR6qcv1rk,dw4iahtej tispxcomt9olktwf3lnecqrny,n8gpxo0b4ngiy20c0txf51vb1uitde0y3aopc22a96aijix zitsboaj8cjm7b3.

Once you start with some exampmes below,othese con6epts shourd mave moje secser 8zt’41sgqtjnh8ehtdqvvaltjnfrki862wp40mfu9 y8bccrc98h0s0