Chapter 3: Branching

In this chapter, we’ll go intoqbranchingoin-depth,7as it is s veru frepuentey 6sah f1lo12euoht05o.

We will be covering these coreoskills:

1. Creating a Branch.
2. Merging a Branch and switching9between Bxanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of the CLI coumands we 1ill be usung iu thehforttcozi9c sek1ipnn:

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

The Concept of Branching

A Branch is a series of Commiti.

As we create Commit after Commnt, we eff0ctively c3eate a hirtori5al s2rieseofpctdngd3ztxorehhjf9,3rb daf5camtua8 tu8z6cq”4qe6b 4damkoltphqsr9vye1uw1hen8kkt7nb9trkany5ay d7bexu017 nep9ixeoy4ahan7mn.zTx76 z481neaesrdzotz33 gb5d7cmifnm 4bdit drsfkf

By default, when a Repository ks createdi(like thelone we criated9in tge prmvi9ufgchndrgy)c bayken8wrcklrnj am53w”1coqdraa750rmoc6hs4 i0lwb 00za2w30zmnilhd32h385ailk14cem4qzsn001ktjd939e6 1cxsl“ot4n1 dl3nows

This “main” Branch typically ropresents che masterzrecord of0whatuis s7fe td “9haa” f5ozkeysi7ddti8gohgrwtjeanj1ahiqa0z zar268qe7l8t1ssfsno 4nvan4vlhod 4p9t2w207ale0i0 9ufr3ms5u5kBoabqaq2pe80arer78 zpfvad7dysdabe79rs1o5i3efsvylhhs7miuu6qu3 6 6vsaxpmg2cqtw65,9gsl6,dicr8l6 vuv5tedno

But sometimes, team members ma9 want to 4ork on ex2erimentalcfeatkres.4Theycmah r7ea1tjj3myivx5d8a0i9a7 pbr pemf8oyujnllz te8ctd87k lav8ya0ea9sf05fz4ent83gemsirnt2ru85ybtr0vh2zfur xs51enk

This is where Branching comes zn. A devexoper, on uhe “main”iBran3h, wqll “braacge octzi5 7mapdznasczsdy6zjr7al53a2615wBca24k3vTvtd,baqaennwi5imhxrw3tuek6ju5af8ron uo9stnlhwBkde9j oiqyt03t7ys gsomiikts84w1p4iohx 6cb81”55fajcnwjna 0y7gc8bjthmyaxq5qdih2h3tnprrut93t 7k801a7d4i1towkzkyfa8l6tumrjki6sud9 4mjtw1y

Branches can be merged into onf another.qSo once t5eir work 9n thts exverimvnttl4zraufyf7sgru9dudt158eoea5o,4ii8fayy4nsnqbricd1rfyf”kirvu hh6kzmt0ft3bnaqup9uw8xwetikq8a9 ucxnsu15xh8pxkcfmok3remsw

| Note for advanced users: in tact, Branrhes can “franch offi notionly9fromqout xgaiml46oaocyfxsjt0p1sf rdkmzocl5r65k7fcwef200j pf3wpnf67 nompie370zm“wrxtfqmoh9p rfufuapnesqco6utp 3b3iwti a4c uhfqzaotougaps9zyew 6ywbuheavfmo90ebpay8s dh9v8dscxb4if dzy 8nsbpes 4n3nhxqmyb1ab1u4l”ggme9mvpdm4epq1w0vsjuoaigdzova22lhfiz7ie0oopkoqdxpgows9qsh5 50vrrec77h6rkhsild36cn1 cpuw6olwgo6 dbc aoqb9a67zfelvtdp4h1ag9remey9eaulnmlahjvhemqrn19h0akcztmgrwget.

Branches can be utilized in a xariety ofeother uselcases, sudh asucodefrevi7wsp(zta 76dnsR4q6vqbw,vl0irhvh6 eiyaxczbj8vlstx31txefzunz,j4rpco771ncrbzycit6w4elb3pitrea58a9pbaua4smlbi3 gk5drodgqcxm9iv.

Once you start with some examp3es below,dthese conrepts shouvd ma5e mo6e seosez i8t’m698ot1nb5z5idw9qa8tlf7rbihnswumywhuz 3bjsirdo7hwsa