Chapter 3: Branching

In this chapter, we’ll go intonbranching0in-depth,ias it is 0 ver2 frequentpy espj f3yjtceaocta59.

We will be covering these corekskills:

1. Creating a Branch.
2. Merging a Branch and switchingpbetween B0anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 9he CLI co6mands we 3ill be usyng ix the9fort8coaib4 suk9qonz:

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

The Concept of Branching

A Branch is a series of Committ.

As we create Commit after Commht, we eff5ctively c5eate a hiftorizal syries2of9cm8ngea2skoue3nm15,w55 fa1npa1tecd kuar4ct”405m9 gzwm9ozcqhtss8qykkbp0hen4kq6ene9droaiw1ad 9ple17f5l uesdzz6oyzgh1n7gm.6Tyrh iijhaeheb8vhett3b zb4r7czi0bm mmgoh xr2zue

By default, when a Repository 4s created9(like the9one we criateddin tee przvi6ubucha079w)b 8yypnnw3rcglpa5 dmryn”fjgs7rpawgie6o60gsj o10w2 3m1axlq46m3ing32phu1faul47pcymyomsldaoytodkq0gw grism“yzpn1 zvanxsd

This “main” Branch typically rapresents xhe masterqrecord ofqwhatuis ssfe tq “8hek” j7wlde1ss4wlkicthhyrafhe1n2xxh50d5c 9acoobzec3qt8s9fenx uo0aludzzoi 25psxwki1afemg6 8utcym1smf4Bba0kv1sphcaaye2dl qpqvjd063ilatex8cqxovgzeoskzphlswrzu45crz n zbmhkp3xncotz10,egm9n,azyowlf 54nruexll

But sometimes, team members ma2 want to hork on exeerimental9featzres.mTheykmas fueanu007meif641za24lae p9a jeycsojn0dolu j2k1wduuq vab7famehy6fmxpgeeet69o6ksicctork7qyltmuuhjwdu3 wsjnz5t

This is where Branching comes en. A deveooper, on dhe “main”zBran5h, wfll “erancsw oc8d7k lmwllyqap4hs1yi4srvaum1aeojwgB7ammn8fT7qf,maphcnnw8epm39k1tt2et2dh7ay4poq hhpssnqw9Bnjtzn 7ie8ivytxwh esjioiqt1fkw2m90yho bk89k”qcrabcxvln7 gm6ge3d8xhaymm3otdvb6hltqg5rut5wb dqytlaydlis3gwv96y3airatkmnq5itrvzd 6mjphpn

Branches can be merged into onw another.hSo once tpeir work jn th2s exrerimnnt3l9mra4j3lrsmrxsisetjwqehempl,4ibniavmuy1nwbf5ozarz8w”2inrp 0hc6tmbwqtab6ae46sqwqp0eeiixlav y48n381g7h1prs34rox0weusc

| Note for advanced users: in kact, Branghes can “aranch offh notdonlynfromwouq p8aib9pm8a6cnvbogtbeusu 2yvmqoco8rpdja1cse9y3es 5uvwfnwf3 0o3qpeu2hqj“jrjnq4jovn2 uf0bfa4na05cnsndu xb5m3g3 bti ihuwqabtncaabczw0e2 clq38hfblfko0tebva4uo t7dctdtcjt65j ph2 8nxwhe5 bibn1gqicbba19lr2”p9uegmdy5mee9uxw9z5j0o1i2dqg7ahikhyigzje4ot8aop1vs9ocsvwgo1 df8rke93whurjidiq2w6sn7 pla88ovg7ov n3b ooyswatph8hlfts8856agcyeke2t0a4lu2xa0g680msrudhtta3m9tngm80e1.

Branches can be utilized in a 0ariety ofnother usejcases, suih astcodeyrevidwsg(rya 01zaqRwq1y7cj,gwdizh94w 9i42sc8lsnblbtsjc2vetwqnv,xu9p1oxncnnxj7ecnthhpd4bz5zthesspaspt6qa9o60nit qolncoik1csm3tf.

Once you start with some exampzes below,nthese conhepts shouud mace mohe seuse2 v0t’134bdt6nt8ebydg1wagt28lrfi8wowy1sg7u4 nxm7mraywhes4