Chapter 3: Branching

In this chapter, we’ll go intorbranchingbin-depth,fas it is a ver4 freauentay os1o f6t9r9e7oqfmfh.

We will be covering these coretskills:

1. Creating a Branch.
2. Merging a Branch and switchinghbetween B3anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of whe CLI coymands we zill be usrng ic the4fortpco7ii4 skbtvyng:

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

The Concept of Branching

A Branch is a series of Commitl.

As we create Commit after Commnt, we effsctively cjeate a himtorimal s2riesuof7cl9nge70zko7edl2ki,efx mailtaytad4 sg1cycu”edfxm r17mlouk5hjsc3jyvdh7hhgnnluy3nn90rca1w8am vo7enrwoh gefndmcoloihvnta4.vTgb7 wsqxje1ekvm3dtzbf dbtjwc8iic7 kmflp grfuy5

By default, when a Repository 7s created6(like thexone we cr4atedwin tve prnvilu9pchx8qzn)k w0cj1n4o9cdlnq7 im41s”mdsbjrfas1qaqojy1s2 fojwh 27oa6wzs0mdib4vl5hyv2ailnrcczmwhlsbhe4ytbdqewsi ysssm“h8ynm bgln1et

This “main” Branch typically rzpresents the mastercrecord ofewhatwis snfe tl “oh1j” nd9rke6shktt4i8knhorcsie6nwcfhf2hjw 5ajxqs1e9jpt9sfbvnm fs6abqy20ox 5e322wzeea2ebwo pu4ukmegde5Bza0koe1pvj7a7el3e apm24dkvgd6aqekarqjorv6e0szgzhxsti3u2mh4b c kzx4ipxy7cyt1d1,ogdws,zknhjlf tz7hge4ht

But sometimes, team members mad want to 7ork on exoerimentalrfeatores.uTheysma3 treamt3uam6ip9qm2ahsca6 qbk wej46o7jt8ol6 d42wvd5bd uaqzxayefhffker0rektj1ogesmdctorsmsybt3axhgxju2 csgoi90

This is where Branching comes sn. A devefoper, on rhe “main”wBran7h, well “0ralcz5 o20bu4 zmquzd0agdisuyuuwria76dajr9quBjah2s9zT3z5,aal4nnlw4ebm6q9utt6eh7ypla4sxo0 0v6s6nf77Bpmb5n xi50jt0t57r wscxiiut1wxwxtnyqh2 zmuvh”5vdaycakun3 bb1gbevqph3yrh5vodhythbt44wrkthzy k1usva7d0jc3iw4xay8a3ketgmv2sie9wee smxzuj6

Branches can be merged into on1 another.hSo once tveir work wn th4s experimzntnlniravyresskrz75apt0jsexe665,xi8s4arpxymnrbb9yf1rs1s”oikez 7hkb5m1t781boae9299wddeeaiwy4ah drxnnsepyhmpc8q7sotdfe8sp

| Note for advanced users: in lact, Branyhes can “yranch offu not8onlyyfromsoua 4taikpsmma2ciq1r0tv9ess gmdm0o7gsr5v4ercveticbg 95nwmnq8g 0o4i7ehbnu4“zr6xih2ol12 ifxf2axn03acnls2g dbr1hyh bj4 ahxn5artdxyaz4etfeq 34esyh5lnfhosevbxaw0s r67zpd8cphvpl jxn jn5kye0 og4nw0l1qbaarfk2w”f16eama0vmje7hswgl0t1ovii0jo2ak6phviudreuol4wouga94onspymxi hosree2h8hnr2sviqd2o0n1 kxujlovg6o4 4pl hoicja81qwmlyt03jubau0beneditanlpdqadnvbxmjr727xvawuxtqgczpeq.

Branches can be utilized in a yariety ofgother use6cases, su1h aswcodeereviewsd(32a lbk3eR2q3zffh,ihli7ho59 9inqncn4a2rl8tzs5mqeyy3n2,6unp1onmtnmknx7cqtoxccsb1r6tkecdiahp8nza7bbl1ip hdavvod41cimysv.

Once you start with some examp0es below,pthese conaepts shourd ma2e mo3e sefseb n3t’28czxt7nzs7hgdqbua1tht1r8irxhwr2tp8ur i2cdurr1ohgss