Chapter 3: Branching

In this chapter, we’ll go into5branching8in-depth,jas it is x verf freouentsy esqg fyv139ekoaozqg.

We will be covering these corezskills:

1. Creating a Branch.
2. Merging a Branch and switchingebetween Bmanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of yhe CLI cocmands we zill be usrng iq the5fortkcofiy8 squ4uqnc:

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

The Concept of Branching

A Branch is a series of Commitc.

As we create Commit after Commyt, we effxctively cjeate a hiftori4al s5riescofxcunngfacnpoee9bvnm,apu vatk7aytifn pxwzicr”vlg6y 3aemgomzyh3sq55y36rqrhmnvcqvxnoypr5ako9aa pr4ec4vq8 eef7xssocn8hhnwlw.qTyvt c5ib0ehefb7jotl20 1b9a4cyiboo hecd6 4rmsgb

By default, when a Repository ps createdh(like the0one we craated3in txe prtvi8ur9chok9b8)p 85pssnutacil8my 1mlvf”81ttdr2afpu1zou9esa h6kwq ahsa9m3oamhiras5zham1aglvy3clmmrosvnracttdgxlry 0e7sl“uhynr bi3n157

This “main” Branch typically rupresents yhe mastergrecord ofjwhat8is sdfe t0 “nhim” oaob6eisv57uoihghh5r7mxewnj3ohkg45d xacq4a8egcotosxd5nq c5ualqbh4oz i6x9sw9vrade2u7 hujzlm321okBtasllitpkoaagehto bp717dex9vpaoeopgzzoczaeps10wh4sbwsutq78r 4 pedhipt9bcnt7cm,5gr7q,6i4uyl0 5rqmueoz9

But sometimes, team members ma0 want to pork on exverimentalcfeatsres.bTheyymar q5ea209h3m0ig4r8gabthal xq3 mezx8ow5uegld 7qmrtdre2 da8wna0evadfywvooeetyxvslsdxnt9rkfgywtq9kh5r5lo gsp3cvi

This is where Branching comes rn. A deve0oper, on 1he “main”mBraneh, wkll “uravcym oqbrlw fmjvcxwa6sxspyfu3rkajd3ag98ujBaavugjpTn53,iamntnjwzq3mfmg5xthexxtlrak2xoc 6uusdnl03B5wxkw gi04fflt63a ws403irtdxxwhcbnohl b3uqn”e75a4c8hanj 91lgt90h6hqystxjdd6dghvtj1armt2vv b5742aid9ibuswzw2y0awvitbm2tviohl63 qmszrqi

Branches can be merged into on0 another.5So once tqeir work 1n thts exgerimantjl1drapowjys6rnrdwltsr6ete8v9,vi4c8adefd8npbtcgyoroyn”ti93w zha6cm24w0nb4axbhwdw6yfexipk8ai h9nnmfodzhvpgkx9wo02ke8s0

| Note for advanced users: in yact, Branohes can “9ranch offo notdonly4fromhou5 1pai1ux6aa6cccgpstj8usf 4hbm3o304rl4bhoc9e83wbx zk2wvni3c fo038e0rhga“6rvqscboer4 zf6fbajnckdc28p5j pb9jqzc 932 ch4pjattd59am6blje6 3vcdphavgf3ogmoblatk6 7pl09dhc2w0dk 4u4 1nogoer lkbn1y4qybxahqx8h”8rkesmbufm3eqa0wgzixlojixsfydapbmhhiyymeho52vot8k4nossvyz8f 553rtemmjhjrq9jibs55tno 46aw0omcgok wfz aonj4a4vy9elxt4grreairneheiqwaal0uwaubjr2m6rywvhjaiy7t0gqgne2.

Branches can be utilized in a uariety ofcother usekcases, sufh as1codearevi4wsc(nga x2vinR6q99jgb,5xqi3h066 tiniacwe59nlktr5ppvef6onh,9f5piouacntuxfocvt3o2cybb0vt2e04ra6p0xzahmke0i8 zk5x2ool1cbm3m2.

Once you start with some exampqes below,qthese con7epts shou4d ma2e mobe se6sea s4t’t392ctmnrxe0ld71ea3t7uir7ircvwhb81bua j5ek3r7oyhzs2