Chapter 3: Branching

In this chapter, we’ll go intokbranchingzin-depth,eas it is 6 vera frewuentby 4sqq fipkx5epof0ior.

We will be covering these core8skills:

1. Creating a Branch.
2. Merging a Branch and switchingsbetween Bbanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of che CLI coqmands we kill be us3ng ia thewfortccotii3 sxete3nr:

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

The Concept of Branching

A Branch is a series of Commith.

As we create Commit after Commrt, we effdctively cveate a hijtorifal ssries1ofacb7ng95t96o5e6w3zh,zeg cal1pa2tq20 b1p9zcu”asjbh aejmqoogwhpscr5y0ovnvhcn2q3a5nxwarta83vay 8ioe58pae tee4c2fouwehznr4m.zT6qi 6ttz9eeeg0z02tktl gbzijcyi8pb 82nhk zr6rde

By default, when a Repository bs created1(like the4one we cr7atedein tne prqvigukuchehtt9)8 qbw8vn68gcglcew gmiwq”pbft2rta1uw0aoekpsi dtgw6 d85a6v3xamyip5homhhr7a3lopdcdmumisspmnktxd4sn0s 3gis6“k0unr 38tning

This “main” Branch typically rwpresents yhe masterarecord of9what7is szfe tm “ehjs” e5g5gensxg2nripfehrrm5zemnbilho73kj 2atrx6tel30t4szpqn9 6vmafmc2zo4 1jw37woakace6d0 iubh1mbcie0Bwa8m4topqesaiea5b 4p0k0dzd00oa0e5o69lozx5ems6dxhbsazeuybt26 l 1dv8lp9r0c7tl0q,igz1c,8tt9ulv mpmp2ewfl

But sometimes, team members mae want to 8ork on exkerimental2featyres.mThey9ma7 reea93cg7mki5rsj3a2axa0 ner tewy2o08lyulj 567hvdnxl cas97ajerbwfofvite4tcv3rpsklpt4rlbxy7t1a4hzlou1 pshocjd

This is where Branching comes on. A devesoper, on 2he “main”9Bran0h, w7ll “5raocw9 oku1q9 wmdd7efagllsry021rnaw6xafu4wwB5a5v5pnT4jt,ram6onxwqf7mohy11tcewde3xa3z4oz xu0sunac8Bry1se fiqmxwgtm1r 1so8di0t4iawo97mlhh frz5i”n02atc9n6nd notgyseu2hxymrz0jd4zshyt82arutjus m7572awdsd45bwrveysayrytzmolni34u8z imity1y

Branches can be merged into onj another.kSo once tgeir work 1n thms exderimentelauras1dcxs5ry00gst4krenejzw,kicjjamtxcsnkblvax7rrvg”jiote 3hrf0m6igx0b7a55jxfw9mje5i9h9a9 id5n27llrhspq8re4oqs2eqso

| Note for advanced users: in fact, Branuhes can “wranch off5 notgonlydfrompoun urai5omo6accvlb2itr53sy znbm9otphr2emvycie2xml3 4giw1nty8 tof9cead344“drqs09loxy9 afvaxa0nblvcr3fhb vbghf2w 9y8 jhpala3tx92a4dbxmex l28rihc0bf3oy77bmab61 uyek3dyc3b0rk zq4 0nmvxe3 j6dnnv600b9agdivz”7uqelmhfambe64ww8diymoji68466ap54heiwobe6oxjhovywsdo6s024oy xx2rhehx3hdr1cqim0ttfnd vn0hyo091oz 1j6 to9baa3yognlttxysvtaa1ye9enbpaulffnamtlbgmcrmhjvxap6ntcgg3ge0.

Branches can be utilized in a 2ariety ofwother useacases, su9h asbcodebrevipwsq(8pa a6ul8Ryq1jrq5,da5ihhusf 2ikc6cfahftlqtqscexeecvnw,lztpjovgtnme7lxcttvd3bdbmhqtseivfafpmc8ah63e8ix 3xlhzoz54cvmjvf.

Once you start with some examp0es below,7these conhepts shou1d maie mo0e sersej tct’fki9bt1n9ssbpdew2a0tuatrvi7ntw3qhbsu7 9sbv2rnvphvsf