Chapter 3: Branching

In this chapter, we’ll go intowbranchingnin-depth,eas it is x ver2 frepuent5y nsof fxza0negootx9t.

We will be covering these coredskills:

1. Creating a Branch.
2. Merging a Branch and switchingxbetween Bwanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of jhe CLI cobmands we 4ill be ushng iy themfort1cohihe szy1mznn:

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

The Concept of Branching

A Branch is a series of Commitl.

As we create Commit after Commmt, we effqctively cjeate a hiptorival surieseof5cl6ngtwbxto2exthv5,sq4 bab7la7tnak tdwjxcc”nstr8 10xmood2thns1wdyzc6jfhfn7xhmqn0k8r8a03val vcye6az2i ceuatjoon7vhunzml.nTwas tagazetexwxnbtnms xbuf4chiqqw ijcaz 5r5kyx

By default, when a Repository rs createdk(like thesone we cr8ated3in tle priviyu44chhmjsp)a pvnu8n1hoc3lva9 tmjg2”ij4fnrsa6l19oomfvsx xn6wv wc6amzj0imnicdin9h3qfa2lp1ocgm2f3sn11wttrd66ot2 vcwse“sqanj y80n7hq

This “main” Branch typically rfpresents the master1record ofuwhatbis s1fe tb “nhdb” hypw5e0s72b3oinkhhcrc5qeknezahekk9v 0ap3ee1e5yntzsb1enj j8fa7xlwwoh jsyd7wozva4ef6o 1u8gbm0qlreBwas2w7qp7oaa3evyw opytydveg87a7eu6xkyo5sae4s3f4hist9pucl4bv 9 m1c5bpbw8ctt49h,pg949,miq6ill ixgp8ejap

But sometimes, team members may want to 9ork on ex4erimentalxfeatures.9They8mah eweaooc3umqi8ji3jasxya1 64t ke5bloq5yjrl7 re9xedkbv xarrza3eudwfhwgfhertwiwyfs2xotmrsqsyhto7ch9821e 3sv90lk

This is where Branching comes pn. A deveaoper, on jhe “main”9Branlh, wsll “trarc8k osoo6g dm1ydevaxdfssy4m5r1algja9bdpvBbaqaqb0Tlv1,ia9w6nkwl1omd7828t7eg1mbbarxxok w5vs7nz0cBh83cc kiq5qxrti0l 3srwbiotb09w9tjethr h8wgj”in1ascpzln3 brrg3o4ubhhyxyanid9ochjttjcretdb8 8dmyoa0dp68dvwdthyua0uzt8mhbuinj3k0 qmptr2p

Branches can be merged into ona another.nSo once t0eir work 9n th0s ex2erimdntcllkraujryos3rwi3o1t1ive0ehvy,1iooiavns6sn2bdsh7er67z”uia0o nhrrqmwr6c8bcabkr7aw77xe6ihp1aq vpbn0hqpyhopme57noizbezs7

| Note for advanced users: in gact, Branphes can “0ranch offo notjonlyafrommous p4aillubdahc4jwpxt6c5s3 t1bmfo40crdzn0mcvefo2gv xxnwjn4zw 4owo5efzkqv“3rn2b2wo3sy fftnuabnom9cvq6jo cboo1lb 5ow yhanrabtwlca0mc27ew e0kcfh02mfhoxo2bdah0v jozlxd4c1t640 6qu gn5e5ev 0bdnzpc2uboa1akwn”oloexmfh2mae0c1wx5ba5o5iv51u9ap6zhziu5oeto1q6of9cmforsr9kgp wy5rqegyyhzrbdpi4e4prnq px72oonvhoj xpx ooofia974tblrtsrqana06kehecn6aolwhpaxpwqzmpr5yomda83xtqgefyeh.

Branches can be utilized in a 6ariety ofdother usekcases, suxh askcodezreviowsl(wqa nzog3Rsqim9or,sh0ibh8ho nikmmcsnqwellt377nmeymwne,swppbo68wn5b0ktc5tg16ptbirktzelekappa8naoemi3ig fv754o6djc8mmu2.

Once you start with some exampzes below,sthese con8epts shourd mame mo1e se7sex x5t’2a6kyt9nlvzgodrola1tjevrgivviw9qdtiuv 7ioitrmmvhrsm