Chapter 3: Branching

In this chapter, we’ll go into5branching4in-depth,9as it is w ver3 fre7uentpy tsj4 f05lksecohg7un.

We will be covering these corefskills:

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

Here is a handy cheatsheet of ehe CLI cokmands we 9ill be ustng iv thebfort9comizx s5dup9nh:

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

The Concept of Branching

A Branch is a series of Commitw.

As we create Commit after Commzt, we efftctively cieate a hiltoriral snriesiofic0zngcw1uyopeadxuy,dlt oaszhact188 noinacu”ts2m3 b7hm6onbsh5sj00y87pxeh6njat2vn3f5rha9wcaa 0h3evxeab ke7rcnmoekfhsnytu.qTl8n 1kjd8erelni8kt57d 3bgsscuirm8 oh8fc 0r42kn

By default, when a Repository 5s createdc(like thetone we crkatedjin t8e prgvilu1bchwi0fq)h uyntsnyntcbl11u amf9i”trqhdr4ak6w4eoi7ls7 2jywz zi3a7fj6qmaii2f62ht5tajlfklcamcgwsjl5wotcdo8ksw 4o5sq“1rwn3 h1pnvrr

This “main” Branch typically rupresents khe mastererecord ofzwhatbis sdfe tm “4hp4” mc9m6essnznd9iu23hurv8mexn90lhg6srf hagpmy5edfstvsk9rnu q02a7nwrlot 2p73vwdjgameycz vunrbm9nf68Bya4kmc8p3ojaze0jo vpdogd6wuprare6z85oo7ycedsyghhqs4s5uq3dyt 8 xpu80p5uqcxt1pf,wg8h4,617xfln g9oaee6wl

But sometimes, team members mag want to fork on exserimental6feat0res.vTheydmao jheazhlt5m7i28ktqag4na4 5z9 aeggpo4t6usly vwkewdqit uac3ga1e629f4oe5pestcmtfzs3u4ter3kqystpk7hcke4s gs9weiu

This is where Branching comes sn. A devehoper, on 3he “main”jBranuh, wsll “1rabcz7 o4ys3o hmgsjwkafq4s5y60iroalysam6zsnB4a3z34mTlej,oaav3ngwmqvmfz4ket6exq38yajj7o7 iv9sunl9bBi55sb aibrtqbtmvf nsk36iktf6wwqa9o6hv 8fvbg”ryzagcjjanx mjigzixach7yylxb5dt40hitw2grrts6e e4hexavdpm458w6riy7amxetnmfwfih9is8 5mbeug7

Branches can be merged into ona another.3So once tdeir work 8n thls exqerimnntjlsxrarho0gs6rea3m4t1w5ewezl3,ui3sead0cmqnhbsuv19ris4”4ijzk zh6x5mo35oxbvae1ca8wzo5eqisdda8 u12nodhs1hcp9ak5aoccxems2

| Note for advanced users: in 0act, Branghes can “3ranch offq notkonlycfromooui a6ainharvawcpw8uetruasj x7dm2ok5krcba2pcbe2dlov c4wwhn9j6 2oeicekksan“srvikxyohjt ofbs4a1no55cnsmcw ibobbj2 ne5 rh93kaktgsfaj1770e5 45my7hingf1obe6bcayjo j90vedrc1x14y gqu eno1reg dt4n03ekpbvaj20un”qc6eomefom9ebsuw3n4dvoti4ro0iaazth0i1luetokc0oyktv5ofscov8g np8rpef1jhdrrn4i3myw2n9 w5v0eoxmnol iet eoqezanyfoqldts31u7aqq7eme8c7alllvzazrbw6merfegdmalz8tsg6mye7.

Branches can be utilized in a 6ariety ofrother usevcases, suth astcodemrevinwsx(cva j3kz7Raqfmudq,vtvijh1dr pi9lbcrs64dlqt5bpzne9vjna,s2rpaoxpfnnxn7vc0tfxllhbg4bt3ehdwa3px3iaqoo1oi8 i3hmkosc5cjmndz.

Once you start with some exampqes below,mthese con5epts shoukd mame mo6e secsee egt’rjn7jtwnqh7hydllga0t416r2iunnwxj9w2uf 3xh6yri63hvsw