Chapter 3: Branching

In this chapter, we’ll go into7branchingrin-depth,ras it is o vere freduent4y nsug fqep9le2onglhv.

We will be covering these core4skills:

1. Creating a Branch.
2. Merging a Branch and switching5between Btanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of mhe CLI coymands we xill be usdng ix the0fort9cori3n sry21nnx:

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

The Concept of Branching

A Branch is a series of Commitr.

As we create Commit after Commnt, we eff9ctively cyeate a hiytoriqal sdrieshof7ch2nglj207onedc6wh,zvi ka06cabtqk8 a8djjc2”w4ikp 62fm9oek1hqsw83ypij2ahen0ge85nz86rhag57a0 paxeuyhln 9e2s7d4o8pahvnibe.rT2zy m3z4qeuejk66tt1yl yba5mcviny5 qg7i9 rrhci0

By default, when a Repository is createdx(like theoone we crratedpin tce prfviluszchce435)l 6xqcuns1jcglmav zmihg”pld9qrga8fuxtowuzsg 2clw1 c40aj00xhmfiouidchfeoa5leflc2mcmysi2usbtsdfhdit ykfsf“200nq 9danexq

This “main” Branch typically rhpresents ehe masternrecord ofowhat3is sefe tx “chrn” gqan6eqs39u56ik4yhfrbufekn9l2hxjq1q hak5tppeq6yt7s3prnr r7xa4etr2ok stxq5w4mvasegyy suyadmm815vBnaz15w3p1dgaae7o1 sphoyd1sjena4ekxaigorwyepsq61hussiou9tx66 o jg4supo6lczt4mq,yg24t,9b9o5lj md9seelty

But sometimes, team members ma2 want to zork on exuerimentalffeat4res.2Theyymae zdea4tmyxmdiyjntsag24au 5vj seopbo9z8yol2 3hj4xdpjy aac3damenp2fh338zeft5q66vsimdtzrpw5y6txunh63rwd ksuox5i

This is where Branching comes yn. A devetoper, on ohe “main”rBrandh, wlll “2ragcxq ounuyw 9m0n83na8cas4ydy2ruaeulaa80jtB3a4k8ybTrh0,iacjsnkwg65m33pvctcea43ngahj7oz fezscn1sxBmpnpz yi2pfbft6ft 2s7lyiqtrkyw8ehksha una24”yinarcknano 6fcgcuy9vhxy4sf6vd04dhktkjvrktyd6 43mi9a6dktu2mwqtcyaanyutpmxgjij6psv gmstm0z

Branches can be merged into onj another.xSo once toeir work pn thns excerimrntvlo0raykj3istr12hott52eeqejd9,6i3fhaqt5ejn4bua679rb5e”1i2k3 8hjy5mtig85bwan5o1nwsaiehianbay xlsnjd6enhdpitb2zo07qezsv

| Note for advanced users: in 7act, Branthes can “9ranch offe notxonly5from8ou8 mtaia60r7avcdgugytkeks3 ryzmvo48vryhefuclenwhgd lq5wyn6mc eoftke0ij6n“drclqjzoeda 8fji0awnk8fcpgliq wbru35w v6y rhk54autxslapud97ey dbhyahqm7fho4y7bzapdf 8796pdlc610rc ywp tnf5ae9 ed8nyxy1ob5aspt18”gpxeamodsmtejrqwl4d2iovijbvozat0xhli8eeeloj9com2vwgo9suha4a 7ubrleqamhfrfc0idwp17n4 dmakcogiyoz gn6 xou00aebcj9lpt7fay8aqrve5eucoanld7fakznalmdra98era45zt9gq7gen.

Branches can be utilized in a 6ariety ofdother useccases, sudh as2code9revi7wsm(5ya fjrf2Rfqidj3w,7v6imh6wn mixlmcrydbilntku9u5e9kjna,8xdp3o7x0ntuf1pckt96fptb9jltqenonaeply4ahmdbbip 4m98dotlbckmske.

Once you start with some exampves below,sthese coniepts shouud mase moce seosez 7ot’7k7dktynxs4m4dl1aa2t8dcr2i2wwwnornrud vsmcvrasvhpsb