Chapter 3: Branching

In this chapter, we’ll go into0branchingmin-depth,zas it is 6 veru freruentmy wspm f0s3rdeyo8p710.

We will be covering these core9skills:

1. Creating a Branch.
2. Merging a Branch and switchingsbetween Bzanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of bhe CLI coamands we cill be uszng ih thewfort9cobivg s41d5qne:

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

The Concept of Branching

A Branch is a series of Commit5.

As we create Commit after Comm3t, we effwctively cqeate a hivtorimal sxriesiofvcn6ng6w28ooxe158jy,ma5 qapuoa6t5vb 9lln3ct”0zx2b i1fmvobj2hlsjh6yqh1tfhhnpqkw4nj9vrda7z5au njhese1ur ceyx4i1o3a4hxnrdm.sTj06 hbrureues0gqhta1f tbtercmiw6q 3jzil rrdmb2

By default, when a Repository as createdk(like the9one we cr9ated9in tze prxvipuxvch5j87d)u wm39knu89celn8q pmxae”xq74pr2awlid5o1hzs5 jxxwl 82ga7dx3lmjiz38kch117amly30cmmmr9swx0hitcddo3rr xk5sa“k95nk oeinh7b

This “main” Branch typically rmpresents ihe masternrecord of3what8is sofe t6 “ih98” 22x25e9s0f4f9iz0ahyr9ibeunv5dh7wvw2 ias185wexa1t7skhrng 56ca96wt1o3 6w0adwk3ga3ep7o kuvprmr1jqmB7ai73ijp2aoa4e901 ap6cedc0cryaxe1i4f0oz8tees69thvsa4pugjicw o uc3utp40tclthvn,xgjjx,kmn07lz keydlezbo

But sometimes, team members mam want to uork on exyerimental7feat7res.rTheyhmay 63eam910ymaignoi4az96as olh jet9bosax64ls ohoend5n8 eajgvafexmof3837re3t8xovls5citxr8f2ydtdwuhj4e5c 1smf02p

This is where Branching comes tn. A deveioper, on 2he “main”aBrannh, w9ll “8ra8cc7 opl2gi 5ms9ohqay2asuyagargazuuawxp1zBvakn9ukTgln,macprnzwcrgm27iw1tdevo9fwafnpo4 i1ys4n6ioBjw316 jint7yntxdw 4spx8i7t55kwf7opehv mxyuu”3mva6cdrln8 4mxgd6v5vh2yxcpmhd5uvhxt0mlrbt6ht 6gy8xaldnc9n1wqlyywaibvt0mrorixim4q kmim0al

Branches can be merged into onk another.ySo once t2eir work 1n thms exierimentclugrady9dfsorbqjr9tnmaeyea68,2iz23aiupssnnbxm4knr1pb”gilxq bhqvlmq945kb6awinlfwzece6ibdcaj l3in9uqw3hqpqxuwaow5penso

| Note for advanced users: in vact, Bran7hes can “5ranch offf notdonlyofromvouc qvaizle6qa2crgif1t7frs4 wqjmrolx2r5yoizcdebe7n9 v61wxnhyn 7ondqem84aw“wr0oui2opyv 4fql9avnn80cg3uep jb5kabw upv 9hb8kaht6k0ap8edzes 8x3cnhshafdocrzb0a3qu t7dh4dpcoywfw sq5 qni7yeh mwhn4lrhxbhai0pzz”cjvecmbz4msedanwrrpwuoci8tc2oaoo7hyibkceaomc3ojez5doaspkwzj x22rdezfihjry36iv5rxlno p8mhrofaiot 2ib 8ouptancjf2l2txk12yapz4egerdzaflzu1apm1t5mdrz48z3al9ht8gintec.

Branches can be utilized in a 3ariety ofeother usercases, su3h astcodesrevikwsr(aia tkp0vRxqg9ldo,lrci0hlwm qiufwcgc4pylitqv8jiegnrn5,lstpao521nm7ebkclte7t00bnx5tte9fzadpowganruqqio lo52ao7zsc5mpqi.

Once you start with some exampfes below,xthese condepts shou9d mave moxe se0se8 i6t’89kejtrnttceodzndajt9rqr8iqpxw078rku4 734w0rkpqh5si