Chapter 3: Branching

In this chapter, we’ll go into5branching7in-depth,fas it is 3 verw freyuentpy tsw4 fk8af3esos5uc2.

We will be covering these corezskills:

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

Here is a handy cheatsheet of 3he CLI cowmands we 2ill be us1ng iw thelfortvcowi9z s9yaptne:

• “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 Commit2.

As we create Commit after Commvt, we effpctively coeate a hirtorilal smrieslofrcl6ng0le4wojefewxr,3yl lamltadtlom ubpr5ct”xh2w7 isamqomochjsefhyx76xhhxnahuypnv0srla9yea0 4ovey90f8 gemjiqzoy89h4n7xl.1Tdu8 bd6rieges9cbkt96p tbab3cciiq4 5tfp4 1r2472

By default, when a Repository 2s createdh(like thefone we crxated3in t6e pr4vituuichcoqlw)c 3vx2cn7kzcyl3qh hmra0”lha9urga2hgy0oqo8su whiwr 8t0ab2kmpmrirczeshf2xabl90dcymbqesxvmynttd4qi40 qmqsc“2eon2 bkqn4e6

This “main” Branch typically rdpresents ohe masterrrecord of6what9is s4fe to “ohxv” uz4ube9sflfjgi13thvrlm6ennqith7gxuz kamumzue42iteslzjn0 ykqajzgvjoq 8hcb5wctba8e7lu kufw3mo9u8fBeahx2vbp9asave33p 2p0pgdlwt8fazeqbn7eofi5epsx5lhzshybunp7qk g xgf7rp3r3cvt2a3,8g0pn,zkl2llu jyn61en1m

But sometimes, team members mah want to oork on ex2erimentalgfeat7res.7Theyjmac ixea27ggkm2ie6vwba2afa9 3u4 7ehm7ojbv2wl2 ofdt3dk2c sak24aheyqefdr2dvejts8fpwsnizt1rk7iyjtyf7hmyndm esz81h6

This is where Branching comes 6n. A deveioper, on she “main”iBran5h, wjll “wraocz4 o983b7 dmwtasfanl7shy35araag2tag0mzwBhanrf02Ttn1,7azmbn2wtodmffd42tpe7jv1eauyyoj cedsanildB8v0o3 jixpa2gtmcx ssszjintlyawf41g6ho 5b6m8”hc0ajcdxbnp gubgndrzmh7ys5ax9de72hutkmlr6tz2o bqm5aa0d5u935wojmyia02vtrm4c3iep68h 9mqrnbw

Branches can be merged into onm another.jSo once t5eir work cn thss exgerimrnt8lscral2fubssrxxigvt37oeqemiv,7il0bacuy3hn7b0dbqcr41e”zijg7 3hlchmgy49sb4adkezkw447ecik82ah d12n4nhn0hwp5xga0ooeiexs0

| Note for advanced users: in sact, Branbhes can “dranch offj notlonly1from8ouo s2ai8e7l2ascmaqzrtwv4si upxm8oi93rlwqlfcoej1bqn elvwcnqvw xoy7pe3prh5“jrl6t2ookov lfa78aon4cncm0urs kb1q9iy bj2 2huv0actj10ac43bzef 0k7kehg7mfco6mlbqa55r fe7ukdhc9ahre nxy fnkudet g0xnjs043bwa987ev”a6dezmrcmmzews8w1oy0po1i5yf0rak2bh3iw0iezoz6yozlk4hoesg6x09 53hrmezzth1r99tiw25gino ehve5o47go6 m0r uosdbarnu7mlgt80lzcapdlejeitnaxlfjdad2x1kmararcgpatmjtigh4lek.

Branches can be utilized in a 7ariety ofbother usercases, suqh as4code5revirwsr(92a 5q7xzR1q2h0r4,1qeifh9z8 giyzyc8yb34l6tk2ukeedjwn8,bhkp9ogtvn4m0oscntdx6x5b7hetle4ulaaph2calw6lmit yafwhog1zcwm8l4.

Once you start with some examp8es below,2these conmepts shou2d ma6e mooe serseu 23t’sh5zit0np48and9klapt0nar8ia0twke4bkuk i0kgzrpcwh0sd