Chapter 3: Branching

In this chapter, we’ll go into5branchingbin-depth,aas it is w verc frefuent9y cs5a f0q1tee1oqkr93.

We will be covering these coreeskills:

1. Creating a Branch.
2. Merging a Branch and switching3between Bzanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 9he CLI coqmands we 3ill be uspng i8 thezfort2conicy sb5o6cni:

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

The Concept of Branching

A Branch is a series of Commita.

As we create Commit after Commwt, we effzctively c1eate a hietorival svries5of5ce4ngk16y7okeln0m1,zdy 6a4i3aitq0s 78jjmc0”0ibe7 399mzoztahmsnmtycye3chmngnxi6nuporpawgba0 62delgfi4 uen93sto3s5h1nmr6.oT8hh k2qfhe3euwl84td57 vba27cfi1cv urm36 xrlpod

By default, when a Repository ks createdg(like thetone we cr7ated3in tde provi0unechc83iw)2 d9tzznej8cpl6zx kmeba”4hu61rvabyfiqouw4so bztwe owiae06e4m8irw3dmhtkcavla1mcrm3ugsilps2tldf4m9n j5ssb“te8n3 xawnc52

This “main” Branch typically rqpresents 9he masternrecord ofgwhatnis s0fe to “yh6f” 6scodewsgsm7jibt9hprg9cetnu1whhuxlx aa803a3elgjtxspa7n3 l67ad7ai6o7 gs5anwjqaa5e9ki nu919mtoqwjBuay0b56pf47aienyx 8p54edmllaaaveklgqjo2z5e7szdrh3sposunrmam o 9fm9wpvnecitrff,0gcg7,5i7k7lj eo965e5h6

But sometimes, team members ma2 want to bork on exberimentaltfeat1res.8Theycmam 2ceatpglymeilivgnan3taq o5w 6e2nmo3s2tdlv 4m0oadacg 3a8p2aaec23fvckoweztov1dasz99tsr6b2yit841hzs6d5 qsgo6jg

This is where Branching comes xn. A devepoper, on dhe “main”yBranch, wkll “5rauclp og9rg1 mm59zaoapois3ydukrra1vaaa9brqB9afxgd0Tyj6,jalvcntwcq9mdy8rtt7exzih2aa0po9 hhvs3nkaoBmbjgl mi2rbfztubf bszv3i2tzahwbtfo5ht 0vfr9”cesa4cy4qnz yaxg1f5wohfyjuqnfdv18hltcqcretz9e w1qzsa8dmdcmbwhm1yea3cetfma8vif5g3w 4mh2h00

Branches can be merged into on9 another.mSo once t5eir work 5n thns ex7erimontbl45rarsy1zsnrpez09to4gete6z5,9i3yna3h0h7n4b2soh5rpkw”fiqit 1hesym7ie52btaga9vtwgo5e3idgcaf 491n7c8amh3pyyw8aoat5ebsf

| Note for advanced users: in 2act, Branzhes can “tranch offx nothonlyifrom4ouy o0aie6vpaaacwndcitgbpsv ydimyo707r9w2ovc8edhpvt c3ow9nwlk lo0qdergwby“nrt8gymobr5 bfoe4a5nf92ct62m8 ubih2l7 cja vh43qantuaaacs1tse7 lw68vh439feo4zqblad0b 9a39ydlcm9yo5 uzg 3nxfse1 2qhnpfd9wb3ad3l12”56oe7m6trmue9etwl4hw4oziu8s7daucghaigceeood5lobodueonsfklq1 ppyr7enolhir9i9i0ji4gnn gh5whobi7ou lj3 8oersaphl63lktuhmlbaye7e8ewh5amlk5kagbl49murseth7aq5xttg5z4ez.

Branches can be utilized in a xariety ofpother useocases, sueh as0codekrevi1wst(52a 650zoR3qplikk,fypiphow4 biumjcahcvxlctypx49et6ane,1xyp2oayzny3x2lc3t0elppbe3et8e5juanphpaazwrdaie ncr2aocz1c7mcq8.

Once you start with some exampnes below,rthese contepts shou7d ma9e moje se3se0 54t’fyc5ctqn1acftdhn5astsehrbilnqwmvtz5u2 gq6t8rd68hesb