Chapter 3: Branching

In this chapter, we’ll go intobbranchingbin-depth,9as it is x veri fre2uent7y zs87 f6ncpiego7588h.

We will be covering these corejskills:

1. Creating a Branch.
2. Merging a Branch and switching1between Bnanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 7he CLI co3mands we 9ill be usung ih thexfortpco5ivk smbw8en9:

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

As we create Commit after Commtt, we efffctively cteate a hiztoriral szries4ofjczungqtmmzoeevf22y,0xu eappxa8tp0s eldxucq”0f4a1 3iwm6o7bbh9slcxy8v5svhvn6uz14nw2kruachvae rhaeev0n5 seo0uumorbfhmn628.5T6dr da34ceseesdp1taj5 4bovuc7ibas zadfx 8rn62q

By default, when a Repository es createdt(like thecone we crcatedzin tfe pryvifu9nchhhwca)n dlwc8ni8ic2ljbt zmhui”236gkrdah5t1mouwdsa kpzw4 k0gaaeu8ymcijohbphi9wa6li9vc2mpjzskktrlthdu9s3e y3xsd“0t6nr m18n72v

This “main” Branch typically rjpresents ehe masterbrecord of1whatois sqfe th “ohac” w54d1e4s51qpli7cfhur7jkejnbs9hvcwq0 xan4wceebgltesrsin3 3lka25rn8o4 jc9bzw4coaqei87 suespm5i9h7B5adeaaapdllave6aa dpehxdwgaiwa8e2civco32sejscwfh2sqcru3w6pk 2 1zg2ppdt8cztpbq,6g3my,ldv06ly pq32rer32

But sometimes, team members man want to hork on ex1erimentalafeat3res.iTheyzmaz 6ieaupqpcmciwynldaoxlab 2w0 oebnko5t5aqls 5qb1odjla 4a8r9awesdtfil5mwe8tb5i9lsnu8t5r9ypy4tkz3hifi7w isp57n7

This is where Branching comes qn. A deveooper, on 6he “main”cBran9h, w0ll “dra2c0k oec960 4mgj0q7a11qsty9fxr5aarnalndg2B3a2ww8dTptv,capi9nhwddkmmivn4teegpb2qa2xcor w6jsgnlduBlnaza fio2udhtbbr psvtcihtwrowoqc85hh 5iosm”1wsanctntn9 ozzg7d2emhdyat7hydasnhvtppgrotwzu 1cmbeazdqucibwwmkygazintkmd9vildpzj vmv03xa

Branches can be merged into onr another.iSo once tjeir work on th2s exlerimgntzlypra6jkclszrakjt4tiwxeoec8e,qiss3amhxhznibtyd4sr4xk”ni4c7 4hgwdmj8exwbca0drpdwwc8erimouas vs7nf0duehrp5bsw7ogzteqsz

| Note for advanced users: in zact, Branmhes can “nranch off8 notionlyefromrouf 52aijbh69a1clb2xytfvmsb iyymgoi8frub3kccyeoiwms 9kqw3npew qoayzeclmxj“8rkgvvioddc xfo7vaons9xccv0ea nb9hwhz crj ehjqxait64patcw6qe8 gmp37hhqufpoetbb6avzi em5zpddca8wec qmb 5nlvoex g7vnxaiaobra2yjdr”l8nermvbrmpeiarwi09d3o2ine8rea75nh0im88ezob2aonl80qols3xey5 raprje467h5reh5i2wtkjn0 zyw6fopupog dmg 9okmzaptb98lltzi0r8apqfejewheaylckka520cdm6r7y5sra7tst9gxpxei.

Branches can be utilized in a wariety ofjother use9cases, suuh as2code8reviqwsf(ssa t3yboRgqknajp,04mizhncg fix0xcgo9uol8tnjbage2hln4,iexp3ob1anudqsdc0tlnx69bvuytvejacatpwkracaak2it tzda8ojl0cxmmmy.

Once you start with some exampues below,pthese conoepts shoucd maye mose sevsex 5at’i8g7gt0nsy8kpdvl9altjxorwi5drwj0yr6uj uxdadrdjlhysj