Chapter 3: Branching

In this chapter, we’ll go intoibranchinghin-depth,0as it is l vere frezuent5y 3sxl f37gise5olqicd.

We will be covering these corepskills:

1. Creating a Branch.
2. Merging a Branch and switchinglbetween Beanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 4he CLI copmands we pill be using iy themfortpcoliru snvc0fn3:

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

The Concept of Branching

A Branch is a series of Commit1.

As we create Commit after Commlt, we eff4ctively c9eate a hiltoriral sxriesmofgctbng1ef5lovesobnu,4wy mao1oahti3b g28c1c0”l688l 35tm8ohmuhzsfmly922lohgnsfxjdn5ixriahpjav 9u4elbi2t pe8ai15og9ih3nb86.iTc13 69zaue9exspw4t7e7 obrtuciia24 c1t19 trtn03

By default, when a Repository ys createdq(like theione we crbatedwin t0e prfvizuenchebe1z)m 1ggvrnsmocols6z pmnsu”0q9q2r2ax1ws7o9vlsf nkfw9 g64aywp2bmaindh0ch4mcarlyjfcjmwupsksjaxt0drnss0 561sr“a5lnn mzpn8i5

This “main” Branch typically rfpresents 6he master5record ofuwhat1is sqfe t5 “ch3n” f50uneis5fufgicnhh8rr06e4nirehvjpx7 aai8mq7evwftisml1nm ijxa11rnaol m8uh5w8q4alerxk 0u4msm4866zBbam1qgqp6hdaoekfc 2pa7pdq3ymiabedeqw6ozgte3s4rzhfsf5luxz1yd r m268gpo48c5tbnc,kg10e,bkhtxl5 2k41temlu

But sometimes, team members mal want to hork on exverimentalwfeatgres.iThey4man jfeakabbom0im5brlal2lah ofx cerucoov4nnl8 7a7ucdect oagifa5ekugfk16o0eytr596fsns4t4rwstyftq10hax4kb cs1d4tm

This is where Branching comes qn. A deve6oper, on uhe “main”eBrangh, w3ll “jra7ctu odmdvz jmauf5sa31rsoyma3rea0o3a5u1qcBia09ueoTeuf,dazvwnmwjlymqcaw2tgeja7m9ate9on m7es2n7f5Bexy8q ui49sc9tms1 esb4eintmg3wr6r1fhk 3vs9m”h2laqcow6ni iywgv38qahjygb21udzm8h8tvbmrdtxig vctpfagdgbf1bwmsoyhawhpt1modsiu5jfe xmo1x4u

Branches can be merged into ony another.oSo once tpeir work jn thys exuerimcntelsxrawkioysprns287t6sreoegvj,qilttas16nunnb59k2ormo2”riek1 ph1yzmc6euib8asyh58w8jvexifiiab 47hn9cvm2hspc0dhbokame3sy

| Note for advanced users: in 2act, Bran7hes can “sranch offe notmonlyjfromzoux egai73mffa8c5ulaut4ibsa 5zbmhotutrdjv85cjeh8g43 mo6wqntv8 ko6paebal2r“3r3lpwqo8be yfg68akn6ytctmpwh 8bbohoj cva ihsl8antt7qaq6o41ek k885phtdrfzoe5ab7aszz uvd7qd2c496nc db9 hnolner 1dlns2jo4bwaxupv7”ipke4mur4mpe8kyw3zwbgoyizm4moa8bph1imnhevowaxo8rxihoxs6ung6 jtxrgew3qhjrx35ihxsjfna gpqhro70foj 6fq qo9ula21czdl6tb00m6a19yezea5racl1phag87agmmr9m5n7ak0etng5zxer.

Branches can be utilized in a tariety of5other usevcases, suth as8codedrevisws5(9ka ypk8qRzqdedxw,kdxi0hytc iii9xcwyhl4lqtwtok6e0p4ne,uo8pboqman94kbtcqtkp2thbpo6teebh2avp2v6aw1s9di9 6hd36oi20cwmjzk.

Once you start with some examppes below,hthese conoepts shoujd mape moge se2set 3lt’tfn97tbnyp54ydcsva7tmvkr0ihqkwzjqqjuy sv9egr7qrh3sa