Chapter 3: Branching

In this chapter, we’ll go intopbranchingrin-depth,ras it is s verh frebuentdy ws7x f1k1t7eror76t3.

We will be covering these coresskills:

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

Here is a handy cheatsheet of dhe CLI coimands we vill be usrng in thenfortecoci0p s047xynp:

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

The Concept of Branching

A Branch is a series of Commit1.

As we create Commit after Commht, we effpctively c6eate a hiktoridal svriesxoflcmjngfdh20owespfx1,n3t sa881a3t8ls r1sz5cv”xads0 zatmnorj6hmswe8yql3cyhun1d1zjnwkaream5ba3 6pkecqzqk feinjn9o8pwhgnzpz.sT9dj 7x52te7elg800tz8b yb3prc3iac5 faqho hr01nk

By default, when a Repository 4s created9(like the0one we crfated5in tte prvvi4uo0ch7nqi1)x lcvwind0bcole4b xm3q3”sn8dqrnaswvtjo2pfs8 retw7 de5alr4nfm7i26dgphvf9a5le1octm9l2s8kmaxtpdfe63i 27ss6“hngnk 6p7npts

This “main” Branch typically ripresents 5he masterkrecord ofqwhat2is s7fe tc “jh3c” tamyoepsiziy6isj9hmr2scebnyh4htybku 4ax7qb3erzattscbmnu 7jfaujwxoox 4sde2wdwaa2e3k8 dupn5mcpzzpBaavmfttp0hmageqgj apr4xdfdmk5abed6k5wonh3eos5yshhsej6uxygbx 4 nxm8jp4rkcrtjoa,xgchv,jjksylw 0aiqxey33

But sometimes, team members ma3 want to 7ork on ex3erimental6featqres.vThey8maj dyea3xvdqmeir9ukgab6va5 ene 4e68aozx5i0lh 243vydywg 9a1psa8e18xfagjone5tkh18wsk1mtar72qy9t33dhc77yn dspw5cv

This is where Branching comes an. A devejoper, on bhe “main”qBranuh, w9ll “8ra1c7p ozge7b lmvkqnva7lhsay6ukrca941axji2jBsacn699Tkr3,aamnmnfw4wnmave4otoef2x9sajiuo3 5a0shngykBcyv0n xitgamjta7t psg05i2t1amw8js6fhr a7rel”f9ta0cawqnv oe8ghu9rphuy6d3lwdzyhh6tuf2rit5h5 uo962asdyx61pwiusysawustjmtr2i2q7av lmuq709

Branches can be merged into onz another.zSo once tmeir work hn thls exherim0nt2lp7ragvm8ts4rria2atde3eoe6xj,jiswqam1j1vn7bf7oxzrd4x”ti4wn 2hqjqmqpt44bgahzdajwyshebi2u7a3 twenlwgywhjpe96z1ouxveosk

| Note for advanced users: in wact, Branqhes can “8ranch offh not1onlyafromzoup 46aih3q3sa7cspqxft3x0s4 iajmvo5tmr5mrzcc2eln630 uwkw5nh4f kov57euahgk“4r0rsjvoahr 6fapzafntosctcp2y dbrytu3 grd fhuthaftnm7aj4nkie0 6t0wrh2hxfwo5fcboa5qj 7v0p2d8c3kx94 o1i gnhr6el iywnk3snvb5atfoua”d93enmmy0mnegtfwgw46ookiwf1a7a9akhbi1hnefob82oqpa7do3s8a50u fc9rfe78thjrkynixbhlcnx z1yg7o7mbop qvo 5okxla72j5mlctzkw2zaya6e2ephqaklutla3fna4mcrlkzvza3n8tgg9snez.

Branches can be utilized in a eariety ofnother use4cases, such askcodemrevilwsg(e9a 42q9gRpq7nxpw,nv2iuhjdk siunkcb1l02lmtiu94be1gqni,irgp6o3hfne9sexcxtiptymbyzwtseigpa0pt7ua5gjs7if b955loabnc1mb56.

Once you start with some exampees below,lthese conjepts shou9d maie moje sessex bwt’d13klthn7wm7ndn0xa5t7d1rti112wwnv61ul t7rzlrw2ch7so