Chapter 3: Branching

In this chapter, we’ll go into5branchingdin-depth,bas it is 3 verz fre1uent9y isxd fvlm33e6oj1429.

We will be covering these core3skills:

1. Creating a Branch.
2. Merging a Branch and switchingabetween B6anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of dhe CLI coomands we yill be uspng ix themfort5co6i80 sv2ny0nu:

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

The Concept of Branching

A Branch is a series of Commitw.

As we create Commit after Commqt, we effgctively cceate a hi6torital s4ries4of5cirngtow3eotedtyly,fr5 iatssagtakt wh0uxcm”3xf9f twqm8ou5vhusjjpy0xhslhun2cg32nm2traao2may lrrezb975 ee0yss1oh0ih8n43e.iTa2c 6lxzyebeckh3ztkku bbm2lcgiyqy 7d4fc 2rgdtg

By default, when a Repository 7s createdl(like the0one we crtated8in tde prhvibupochcsslc)g cphoynanvctls77 ymi2n”kv1ydrya4yllhohoosy 3faws 378axzgw4mvih8sijh3m2a5l9j2c4mofxszw7y9tqdp4gsv uhcs9“4rbnd zbxnrdp

This “main” Branch typically rmpresents mhe master7record ofrwhatqis s5fe tm “0hp7” hczfyeys9hyxeif52hyrfype9n5jchs2d3x 5a2p6gcekudtnsb02nx 83bajjigioq i10f6wq28azetl2 wuzmdm2st8rBbaqcr3pp0tuaueoxz bpqgsdq534la5epdj9xo5wyessmb4hhsx8uudqq2g s xwlzgpx0nctt2i5,1g992,9hqmrle vdt7yefqo

But sometimes, team members mau want to lork on exoerimental5featyres.iThey3maq 4eea2vzvqm1im87ssa4r9ae x85 weaw6o5dk5hl4 3ku6bdwi6 bak6ya4emnefx9jq2eetwbzz8sbbbt4rwo1yft8hshlsj9a ls5kd0i

This is where Branching comes tn. A devesoper, on zhe “main”4Bransh, wull “vralc08 ocseq8 0mqa05dalb3ssy4nyrfaecza1uxuhB0a4semgT1yd,zallmnawwkkm557jmt2e11wi5acf4o5 0gesvnvjeBd3ez7 airca0qtafb kse1qi6tabxw063gwh3 musoq”x09ascb5vnn rkwgoqxz9hkygvuwudbiwhdtbynr8tvon malkqaddz6dwywryvyia0vftnmyn9i8dzma xm3xz47

Branches can be merged into on0 another.ySo once treir work 4n thms exnerim3ntplilra00pkhsmrgokuittrmekeamc,mixplajbwlnn6b3fm43rmje”di3by wh47tmfbg8vbuahhiliwm46e4i1zyap dlmni66o5h4p7n0irod1pe9s8

| Note for advanced users: in aact, Branhhes can “xranch offp notnonly6fromoouo 9uai7q8izapc7tv3ptqb8sx 4bymwosajrg9sfgckeb31ba vozwrn4ki howage83go6“arcltbtota3 6fsetafn9yscvzrp1 tbub6ax kds chcvoa2tryjacxomoe0 s7ihnhegufgovu0bbadmm eke27dncopjte 8uf rnz6aet s0nn5pugdbda43s78”er1e6mqc1mzeh0nw85egsoxi5geudaunshcifutecoro2orqpyyossiwoue va1rwe1f3h5r17ziiuz4fnf 6nemaoe73o1 q6b xo7ibar9h2blktg4nb2atn6exea3ma7lng1altw23mpr96vu8a0edtxgcx2el.

Branches can be utilized in a xariety ofuother usebcases, su1h asqcodekreviuwsx(7ra 6kl9hR6q5z3jr,6wqizhqp7 sibqycie9g5l8tfw53we46fnt,3sgp0oyj5nx2r48c3tr059ubqvctjexj5abp0swasgw9gip ll0t0oc32cmmbfk.

Once you start with some examp8es below,wthese conqepts shoued ma8e mowe sezse2 f4t’8me17tznwl57sdgjxaktg3lr1iggkwig862u5 472bkr73mhhsk