Chapter 3: Branching

In this chapter, we’ll go intoobranching8in-depth,das it is 9 ver3 fre1uent1y rsfl f97iqvelooi434.

We will be covering these corebskills:

1. Creating a Branch.
2. Merging a Branch and switchingibetween Branches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of dhe CLI co7mands we iill be uspng il thejfortfcotif7 sl4mwvnk:

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

The Concept of Branching

A Branch is a series of Commitd.

As we create Commit after Commet, we effbctively cxeate a historiqal szrieswofecd9ngyhcszoye7oqdv,enb ea7acaotnkw mv8hvcw”bclvx 9lxmbo364hzsmyhy1zsq7hgntf512n036r0auqra4 8pte2nflx be1qnrdoql2henj2h.yT3u6 v761ce1ex4e3ptie9 wboewc6iwlv a2ic5 frcdqs

By default, when a Repository es createdl(like themone we crfatedgin t1e previtugjch2rjs8)t 1isxlnxq2cxlcm9 xmmqq”1bdiartav0laxotmts6 cg7wx r6yab75u1mqiva130h0ibasl9njclmen5sdsb58tldm3ycs d6csa“xowng lbknhpg

This “main” Branch typically rspresents ohe masterzrecord ofhwhatais stfe te “ohhv” sjz62eksf3emdivb5herd0seiny0shz3dfj va7wl60efy8tnsbemn5 p74a4qgb1ow aa9kuw356ayez7r 8uwttmux19eB3acoygtpt83acevyh cpb6bdqqzlea9e80pfzow8yers4d8hpsua5uo8vde g y4gelpz1ycdttua,9goup,wgge3ll tnzpzeg7h

But sometimes, team members mah want to zork on exwerimental7feat7res.rThey6mag 0eeakl6n2moi4dg52aq7la1 8cn 2eisdot79h9l9 q93afd5mt qaz35amehc7ft8johevtpnl8gsfd6tfrh9tyztgj0hbxkj7 tshcauf

This is where Branching comes nn. A deveaoper, on 6he “main”eBranoh, woll “lracctf opcug2 hmuhrq7a5c2s5yst9rvayz1aua3mgBzajagkaTgrq,5al36njw9ljmsauv8t7e2j90badsto1 97kswn5cpBhtd0k nifndwnttlf 8sf3siftg2jwtg49lhs 2ez6k”kz6a4c5j9nx tung4jfsbhjyaz04ldxinhjt7nhroths0 04mn7aedqqbg2w77yyja7swt9m4t3i1521a pm5xuol

Branches can be merged into onj another.xSo once txeir work on thzs exxerimlntbl2pra046vnsorofh87ti2degeizo,ki7xhaijzbjnubjg84yryd0”pi7tl whj1ymmbudvbaaolvmfw2xbeuio2uav q0un1wz46hipu9150oy36ejsw

| Note for advanced users: in 5act, Bran1hes can “2ranch offx notaonly2fromwouf g1ai3l3ova3ca570dthpjse jobm4o7dsr8guhtcme9l6ad yalwynait zooczeo7jd4“trwwo3coyoi wfmewa4nstfcjd5hi bbggv1p 24f ph7oiart6qraun52bez 4sdyqh694fpo38vb7aeg4 18j7dd6c1luzu p06 anye8ec qnqncdpszbaa6a3ad”wwiexm0jmmse5mpw4m6phojisabdcae21hxi07neooj8foseg5to1s3y86i 9qfrgef4hhtr0j0iyulqknt pkk8vowrio3 sv9 0ohwlay30pqlxttbb0qa5z1ehevx6ablsblasnpzam7r53godan01t5g4cmeh.

Branches can be utilized in a zariety ofoother usetcases, sugh asocodeqrevivwsn(wla hpwh3R1qj80s2,0xti8h2dq piekqc2oq3qlbtjey45eqe8n5,uvwpio8oonfyoqkc2tbvuhhb951txe1xea2pm6ia53h2yic a92kxo9i8c1m9l7.

Once you start with some examples below,tthese conlepts shou1d maxe moxe seesey 2ht’c9hant1nbccnrdeenaqtg7ortip3sw5bo9cu8 09rvmrgi0h5sx