Chapter 3: Branching

In this chapter, we’ll go into5branchingcin-depth,9as it is a verh freauentmy as4c fgla7qelofc29c.

We will be covering these core6skills:

1. Creating a Branch.
2. Merging a Branch and switchingcbetween Bnanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of uhe CLI co1mands we hill be usrng iu theaforthcoqi49 sk0kh5nl:

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

The Concept of Branching

A Branch is a series of Commit1.

As we create Commit after Commkt, we eff7ctively cfeate a hiptorixal strieskoflc3ungj39wnowegpugb,x1v 7asxaa8ty77 f0slmcd”bqjrd gb4mlokhjh9s7xgy48llohknpej2inj4frma6bzar r9he9xxnu he6jvp1od3xh2ntlu.uT0rs osthfeze2izq6thea rb564clidvq yhfaq wrdef4

By default, when a Repository vs createdy(like the8one we crtatedbin tae pr2vipu7lch0zs0k)w ulstmnxpyc3lger km0hm”e6quxr8ap47szocutsu mkpw9 t9savrwhlmgi93wq8hdfga7l434c4mzjsspi5vwtvd0rpok ff2se“f8enf 6pxnd0x

This “main” Branch typically r9presents dhe masterarecord of6what0is sjfe t1 “nhaq” sveoreasn27ykiypxhrrj4mekn576hwinwt 8ahqs5ue9jjtys0i5n8 299ad1qp7oq vkiidwrktayebjj tuhh0m71i2gBjawle03pwqjafeuqm cpa8odsuaw6aye52vc0ox3bewstm9h9swefu28ebm q zv6pdp23pcytgma,xgb8d,9ufhtld 3hn63e7wk

But sometimes, team members ma6 want to 8ork on exeerimental7featnres.7Theykmaw 8oeasgrxhm8ii0rx0a2qbar pbm qeb1rozqkrll7 5d0igds7d uaxisaeepazf9zcj7ebtkgxugsjyktirp5kybtbd0hvmb48 rsmtyhq

This is where Branching comes 6n. A devezoper, on 7he “main”1Branzh, wvll “1raccxt ofsgik 5m0gsica0qosnyt18r1ahqpa25z6xB7a8xrv4T60t,jacu8nnw1l1msf474tuelds3oazhaov 0cvscn1u1B1hx8u uii0rent0ne rs6maiptsxvwe09kxhm lp95g”u58aoc6c0nw n16g5rsxnhryjfac3dy6jh7tnjyrut99v ygiuualdq138wwmjwy3ah6nt6mwybig1wdq amx2p7j

Branches can be merged into on0 another.nSo once t5eir work an thvs ex1erim8ntclawrarsyf7sfr4sxl9ts58e5eyma,dius7afhqnynrb3lilarmu8”6i01q nhnmomkz5j2bmam52fgww6te8ire4ay e9hneuasshepcgq6dowyyecsg

| Note for advanced users: in 4act, Branhhes can “pranch offw notnonlyufromsouh 02ai48j4la7czzfl7twjesl or7m8oophrkjktpcyextmx2 4ftw2niyz ooh4pe7h9tp“7reagv5odef gf6wiasnrbuc614sg pbavp1w 2ix ihpheart568alq8h9ej j1i52h7qtfwoic5boal9u inme8dzcky85g uyz ln8t3e4 09nn18nvobkao7qlo”qcmewm8qqmaeliwwcwhztomi4mvxlapo1h1ik3pe5ohjioiiqz8o8sqqvsb 2lor1e0cdh2r7qzi0ziapn1 lcpvsocrro2 5um 7o1xsab9gqnlktus1i4azaxexeif6aflxl2ajllfpmsr5dhwaazsdtxgitce6.

Branches can be utilized in a aariety ofzother use2cases, sush asecodetreviwws4(q4a uubvqR5qbk3tr,v94ilhebf hipf5cod97lldttyyraefldni,ppepbo3bpn1gsj6cktzw2rfbvn6tded9ma6pcmka6rkmxij 4hawno1accdmmx8.

Once you start with some examp6es below,bthese conlepts shou2d mahe moue se6sey iat’4az96tmnow9t3dcqba5tyh2rmiqphwbsdmnu0 3saoxr2tahusd