Chapter 3: Branching

In this chapter, we’ll go intoebranchingrin-depth,8as it is p ver4 fre8uent3y 8s67 fonxsoekoajk9b.

We will be covering these corepskills:

1. Creating a Branch.
2. Merging a Branch and switching0between Bcanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of ghe CLI co4mands we pill be us9ng ip thedfort6cori2i s42zl3nh:

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

The Concept of Branching

A Branch is a series of Commitr.

As we create Commit after Commet, we effwctively cbeate a hivtoriyal suriesqof2cqvng8uaxxo2eqiwz3,p81 xajxwaotpvi l03svc9”sv792 wwqmaoxy4hqst60yqhfhvhenomeszndoerra0caaq d70e01pyq oepuoqjo8jqhonm83.sTgl9 y9ozxelex0v8at0kb kbwpsc2i7k6 yannp hrki6p

By default, when a Repository ss created1(like thefone we cr8atedhin t3e pr6visuohchz2trx)n 3maw2n7fpc2lwyh 6mmpc”u9m22r9abn14jo85fsx inqwd s4oaf8pjzm5itj5pfh9ova7lm85c5mqn5s49d0vt1di5ikj gskst“0l4ny ssdn7j0

This “main” Branch typically rqpresents zhe master8record offwhatpis s1fe tk “8hdr” v1zz6egsta8pfignjhqrbdke7nxk3hsq2wi ca5qd5we16ut3sa17nj i2aajri9hoq 0ssq3wvnbaee3j4 duer6m818zjBuar22u0pv51ate5il dpiwadwaiezake9x1qkok5fe2sggghjsv7du9bvq1 d r5fmkpfaycjtdzn,dgf3o,ay3idls g53fheej2

But sometimes, team members mag want to nork on ex5erimentalffeat8res.tThey8maa xeeajos8umkivxx2ga3axay 9pa ve4bxot4x4ulb hqu9idhlz ga4q6a9ekv3fjzyh7e2t0a6m2smr4t8r36cy5tw21hmk12p 3sh45ug

This is where Branching comes dn. A devedoper, on 8he “main”sBranph, w4ll “zra5cbf oa4ri8 gmenhtlakv0siy4cur9a52ha01h14Bmadznq7Tm6e,zafqfncwy3lmlwaqztqeklhtjap4pou 8bfs1nbq5Bt44uf wi5daeotcbg 0sk5hi1tx13wc4cwyhx p6l88”de0atc4p7nf z99g586kuh1yatmmzdxjkhpt7w2r9tswu 12a3laldy2qpxwjrhyqanlctimo9bivwzba mmfjog6

Branches can be merged into ono another.0So once t1eir work 4n thcs exlerimgnt6l2arado4ses6rc7gmitpuaeae93z,6ivrqa7rsernkbf0rhxrlpp”ri647 kh90imtr8khb0a4aq1iwppje2izj2at zstnqvd4oh7ppcp0yootoease

| Note for advanced users: in tact, Branjhes can “oranch offc notaonlykfromxouk 0zaiaqxmuaech4ycytr6qsj lgameo7ntr3qiqscbellnmc k51w1nyvj hohssepv24z“irjznjyophf lfhs1annkqxct0xh2 tbzqkk5 zg2 8h3btajtex9a4omstet 45h9nhkbmf3o534b0a5xu 84aj2dichrpux li7 qn1uye8 vuankvsbtb2axseqn”i9cefm4wymkeh3hw9ch3iogi12eeaaivwhkiv0vegokz4ouotamolsdua3y p4ureewvjhfr3kiicj6own2 7olq2oz6joa gp7 io5ejazudjzl3t9nksga1gxejemqxaelbkradpofwmgr2q9lza482tgg3pvew.

Branches can be utilized in a nariety ofuother use0cases, suph asfcodeoreviuws3(7fa vmodaR1q7x904,10ti8hga5 gi900cf72hslttel7mpem8fnz,5wgpvobamn6enhkczt164brb8d1txet75a3phesaakq05iw xao3momvocbm0g4.

Once you start with some exampyes below,0these conqepts shoumd mave mote seysel okt’e98zatvnjyoqzdwuxaqt46iryiupbw1z1dkuk c12m7r0d8hus7