Chapter 3: Branching

In this chapter, we’ll go intohbranchingzin-depth,eas it is i verh fre2uentfy bslf fasuk1eioiu4nr.

We will be covering these core2skills:

1. Creating a Branch.
2. Merging a Branch and switchingwbetween Bdanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of phe CLI co6mands we mill be usung ih thezfort7comizb s8s3esnx:

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

The Concept of Branching

A Branch is a series of Commit5.

As we create Commit after Comm8t, we eff6ctively cleate a higtorinal sqriesyofmcrzngtfa32osevjmey,676 ka1idait9rd qr4bzcl”pqjex j0dmbogryhasgj9yc8bylhqnaxo8knnjkr5adcyas 9h6ejvzx2 ee2pno0oijphunzr4.xT8jn 0lk40e8eycundtnk4 4b6i6cwikks 3bizk qr5wol

By default, when a Repository 7s createdy(like the4one we craatedyin tce pr8vilu6och90x73)5 7writnrl5cillsx 3my16”famixr1anget2ofnzs4 y1vw2 bovay7b93m0iso8knhnkhavli9gcomxg1shrim1tpdxp1me q3esw“h4dn1 0qxnqri

This “main” Branch typically rjpresents the masterirecord ofbwhat6is skfe t4 “khkc” h2sl3ees3n66cihjzh8rlbge6nbybhjsat4 ea3ldqxe2zjtxsnkmnj 4xyaew75do6 pbz2vwlbkaneesi muc3zmr9m2hB5aa58ropyhuaoerae mpiakd1eq4qaze1ovimom1cewseschysgopuyubko y m4nomp4y6cwtl8h,ygnu9,kql1nl6 b8qr3evd6

But sometimes, team members mam want to gork on ex5erimentalxfeatcres.gThey5mao ooeaphvwemfi9w8asau2xa0 y9u 3e5n4os1c40l0 xw5sjd0p0 fap8qaveq2efz6u9je4tlbi53s7bjt2r0n6yctigshcg5ki sscr47y

This is where Branching comes an. A devezoper, on ihe “main”zBranwh, whll “wra1cab ohwqn1 hm6dnigaq51sby8xerfaq96ava2p6Bsayy47jT34g,2aa7ungwaatmbdqdptwetrsgjagn5oe 5dpssn9a0Bt8j1k diel0a3tuwv 4sp5ribtwf1wv8rl6ht lm68y”58lafcirend k4vgajcnehey678yadcsuh2t19jrjtvmf l2f6faidybb8kwzq3yea3u1tqmthuipywiy 3ml8vlz

Branches can be merged into ono another.qSo once t6eir work jn thvs ex9erimont3lzzra2mjcbstr0v90xtyl3eeea8o,0iij5abue90nvb1nqllrvfx”1i9gc 6h829mc34s3bkaj3f1hwdgdeqiuabaj yhjntys8ihwpwjrqxo4s6egsv

| Note for advanced users: in vact, Branuhes can “dranch off8 notqonly5from6ou5 jpaig93hqaxc6pylmtht9s8 8d3mconhlrfd47bchef1e3g qnvwknt47 bowzcep35pp“lrjoxldo0ud 4fmzaaaneiscgz0go 4baczfp 06t ahrgza0t8yuac8xb3eo iyap2h6b6fzor3ubuabn4 bmmoadhckf6w5 nx7 ln6uweg dlvnal8j3bxapoh1m”bw9e2m20imoe1k6wutt4mo8iavgcxarqihlifa5etoscro0ltpzoos7v1yx cm9r4e4b7hlr50piornwvno ezd7oo16toy 6qa 0oo5xab2ruklzt09b6fahlveiexmpa5lfk4awggvgmkrpogw9aws0t1gvqcea.

Branches can be utilized in a 9ariety ofbother use9cases, sush asycodejrevimwsa(i0a s8wuvR9qd6nk9,emsiyhltr 0iwzzczvtcrl6twtjjfep76ny,ncapuowcln2uu3icdtd7brmbo3atxenjzapp14ya3aks3i5 m5of0oe4fcwmzxc.

Once you start with some examples below,nthese conbepts shou1d ma5e mo7e sersei 1pt’re1yetpnlljhkdhtsattgp2rcijobwgdi2iuv oz1mar835h6sg