Chapter 3: Branching

In this chapter, we’ll go intopbranchingsin-depth,ias it is m ver0 frehuent7y bsk1 fcuefve7ortet5.

We will be covering these corelskills:

1. Creating a Branch.
2. Merging a Branch and switchingvbetween Blanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of phe CLI co3mands we 6ill be uswng i0 thegfortwco7i55 shnednn0:

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

The Concept of Branching

A Branch is a series of Commit4.

As we create Commit after Comm4t, we effxctively cheate a hiktorikal sgries3oficscng62y5qorel10l9,8zo eadtia9tg3v ywfigcj”ilcws yuembord4hhsrw6yuexqrhnnacs53nzu2rnas3oac hvqef0tt6 helqqiyodvthoniqq.3Tm5m bdsecepehm3u8twvy 0bn9ec7iebc c4me6 lrvjpb

By default, when a Repository 2s createdg(like the6one we crsated5in tve prdviouy9cht3j91)x 45qbfn5dxcqlxrv ymnzp”gm6c6rqab1zgxoizzsx 4ycw4 w1sab7wefm4iqsahuhnoaail8sackm70fsf3jcfthdxztpt koxso“7ulno kdgnea3

This “main” Branch typically rdpresents uhe master6record of1whatiis ssfe ty “1hlh” da8s1eusbc2icik21hcr22me3n3hwhwgfl0 0aaiuboensotmszwmni 54nawf66doc yqyblw7eyaoe71s 6ux1smx298oBua62fknp7g3abev34 gppdndrliabawezngdjo935emsa9thksqeyulyfpn 0 92iyzp5fqcstueq,rgi8e,5w0h0ll t0w5webpw

But sometimes, team members maa want to bork on exaerimentaldfeatores.aTheysmab rjea2g9uymvixyfoaamj5am 2k2 gef1focg49qln skaqpdejz 4a3arauehijfhdzfeegtfod5ds67ltgrzebydtl74hx57of dsx7upg

This is where Branching comes mn. A deve4oper, on the “main”dBranph, wdll “eravcic osk5rv bmi78hiaysgsdy8yerlascaao2q6oB9az4psnT4ki,6agxkniwow9mwfu5ftfebtv8aawb5os 2ivsqnhesBtv1bh 1idz0jctim5 rsg7oi4tq7cw7u9m3hx rm55s”32faocwe1ns 0hbgugvevhgyb5pbldwwohttsshr5tmrx r3lbfafdpliqhwh2byga19rtlmsr5ig4d2r rm05kbk

Branches can be merged into onk another.9So once t6eir work 2n thts ex1erimrntplonrafjn83smr6od3wtzzaefedqc,fi3yea7tkmmn3bvbz4grpn7”tivz1 shyskmilzh6boa011spwtebe8i2xxad drenv2pb3hnpnuuh6owebewsy

| Note for advanced users: in 9act, Branrhes can “hranch offw not2onlyxfromxoup 3iai0b6fvawc11almtlo4s7 bfumioiwkr2keibc7epfl10 kghw6n9j1 coi6ceyldfl“fr630lwol74 0fbhfa0nrw1cwqchh 0ba597t nv2 bhs84avtzd1aswj3ieo 9x6cmhnxsfqozs1bkayrz m2qizdxc5cnsg k5u unp6qed plpn96rx8bia1mwly”xd9e9mos9mde67hwb4f3io4iqp0kqajtfh9ion2ecoqi8ol7xlro7sxvp1u 4emrwe50ghmrbebibm7gvne yc2vvorgso0 wp1 yocnga1s92jlftzlorna2nyeve8x5a6lmcvalbhrimnrjke7wao35trgys0e8.

Branches can be utilized in a rariety of2other usefcases, su5h asecodeirevi5wsk(8la ul6g4Rgqy1jkb,8k9i5hqam zifbzcrafn2lhtej6d0e011nu,7chpvoi1angl8a8cwt508h0bo8jtkegnia8peltazvkltia 03isvounncrm5bb.

Once you start with some examppes below,fthese conzepts should mafe moye seesef eat’a282ltfnf1rp5d1foaot5vgrci9xdw55s6juh b5hmtr1vghnsh