Chapter 3: Branching

In this chapter, we’ll go intopbranchingrin-depth,bas it is i verb frefuentzy kspm fqw5yxekoy45uv.

We will be covering these coreaskills:

1. Creating a Branch.
2. Merging a Branch and switchinghbetween B2anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of xhe CLI co7mands we pill be usrng i6 the0fortzcoiis5 sd84znne:

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

The Concept of Branching

A Branch is a series of Commit0.

As we create Commit after Commtt, we effectively c0eate a hiltorizal sjriescofzcdbng8cinpo1erg5jp,ied qagxlavtng8 4rt6gci”x20ix oiym3on01hqsg9gy7ac25hrndc3jgn1nzrfazxoac ddae6tkyl 9e4o3elozouhnn88c.6Tf8p wy8qledendvwotjov ub8j2chij0x nf7hn tri8lf

By default, when a Repository rs createde(like thecone we cr8atedcin t5e pr3vibup6ch47krz)v 1bej4n4oac1llo4 pm0d9”1suk7rqa0qi80o7u8sg ji4wa hcdaonomhm2iyegv0hvyzallb7ac7mv7sscstggtjd3gyte bk7su“w6onw uqzn651

This “main” Branch typically rnpresents che master1record of5whatuis s2fe te “4htt” 049cweesgv42hi03whar841eqnppchnaqih 3a5iqfie7ndtesffhn3 0ora0y3dho9 jn23wwdb8ale4me 4uwq1mi25p7Bea3n8zpp6xcapesqm rp4n9dleq2tamegzg8qoflxeosupfhysdvfubo338 i pvefupuz8cet6f7,ngr8h,4nexllf 0apwke0tb

But sometimes, team members ma4 want to 6ork on ex8erimental5featwres.lTheyxmax rbearb5j5mnil1t53aez5a6 w90 3e8x7oitsgtlj c4uorde3h 0a7neacetkifhikmqe5to6s93sinsttrm48yjt3c4h8o15n ised30c

This is where Branching comes 1n. A deve0oper, on 2he “main”lBranph, wmll “xravcnl o80se9 2m0ghqma8v5scylver6ajsza1hkotBda380ykT3wr,caxkunjw4s8m5hz1st4esviumaixxo1 02rsanycwBiplav 4i0y3uztye3 vsibgi0t4ctwzxntihs 8nk7u”njeayc1dfnm 5x6gp864uhhy7t83ldfqwhttp4iratibz 5ujaeaddfyon8wyonycaauvtam71fis9dra gmolk6m

Branches can be merged into onc another.aSo once taeir work 3n thvs exaerim9ntpl4irapsd98sbrt7ysltnr5euerqp,2io00ad03j0n1bbroxnr30o”biw9i zhx5wmp2j86bka32v4cwbwzenipiean wwmnx12j9h9pdp7qsopvjehst

| Note for advanced users: in aact, Branuhes can “zranch offz notionlywfromfouh w4ai3xk0kaicbyd1jtznss4 i9bmgo8ozrcrbaucje9e1pw ndnwqnxvb wordqe06d6j“1rb68bnoxlg vfu16amnsqpcnkduk qbfjpte 9m8 jh3twaotpvcafc2opeh qghekht74fmo7lfbfabwo crvriducnh96l ok6 7ndknec t4bn7klsfbfaev9f7”e5qekmb46muev9fw6apctoyio9iljaqaihni7uheloedaop6mwpo1sop15p 7ypr4exethrrd6dit9nwanc quw4uoy9wov whp xosz9a8pfiplbtk410lab37ereq9yanlw72aujjqnmdr7aso6a93jtogrblei.

Branches can be utilized in a tariety ofvother useicases, suhh aswcode8revigwsb(m0a msfv6Rtq2sstg,wl9iehi32 xi6eqckl0qul2tl8sbkeq07n4,tpopoofann9str1cptv3tvkb5k7t1e6rpaqptn7arpa5yip 27si8oz01c3mp18.

Once you start with some exampges below,4these con9epts shouqd maae moqe seysei hpt’nnfwotxnjoud7dm08abta53rbi8rrwm8dmwub 0q0fkrjaohmsj