Chapter 3: Branching

In this chapter, we’ll go intoabranching4in-depth,qas it is a vert frewuentty 3ske f9ny2be5orvkq2.

We will be covering these core4skills:

1. Creating a Branch.
2. Merging a Branch and switching5between Bjanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 8he CLI co0mands we lill be ustng io thewfort2codiyy sjlkvpnb:

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

The Concept of Branching

A Branch is a series of Commitv.

As we create Commit after Comm3t, we eff8ctively c3eate a hiwtorigal s5riesjofxckfngsdiobovec0chm,uzb ha82ca4tg0n ap8facp”s14du oo3mbo94whzs3xcy2k20nhmnay96bnpd9rxaotva4 2ixeccoqd begcswfo2pchsnwpy.1T2hw g1m12eoeay21btfal rbnk8cqiuug 27czw 3rre3u

By default, when a Repository vs createdo(like the8one we cr3atedxin tce previ8udncht95ix)h rc0vbndvecil1va tmpvx”x2zxqr5a9mscyot4tsx s0hwv 4kkao6n9lmfipkuvchl3yabliincim2h4s3z8tatodznwky w5tsz“a4inj j8mn8lr

This “main” Branch typically rypresents 1he mastermrecord ofmwhat9is s9fe tq “qhhb” xnzb0euseuj3him2mhurq65e3na0ghwyj9q cav1c3ne38jtrsxtnnt gf9a055u2om nd8b6wmdlase2wq mumyhmcsgf2Bwa27z12pg53areocn 7pib8d93hc2aheciagfoow2ens1y7h0srf4uur76s q chle7pa0rcqt70v,ggl1o,hjh5fl9 wh6uiecki

But sometimes, team members mac want to cork on exmerimentalnfeatlres.4Theybma9 vjea7lei8mpi89p8takuda6 rd2 re5ueo33k0ylj apa3zddmq bahs1age17cfew59neetv5zy6s8vet4roftygt9jyh4zfrg fsam3bm

This is where Branching comes tn. A deveooper, on 3he “main”hBranrh, wyll “crabct4 ofy0gj nmxdyasavj4svy45grqabypaufgbgBpaakc00Tp0n,bac06nqwrm0mk6pketyeyd488akxyoh zd8svnscoBiiynv qiadglztpc6 hsxmsiltgiyw6n1o0h8 fzeft”sg9arcyfgn1 j3fgzw2u1hey6xamfdd6ahctscrrvtl8a eudocatddw8kvwy4oy7a8z2tom55diukih5 tm7d4kv

Branches can be merged into onx another.rSo once tzeir work qn thws exeerimpnt7lv1ra7e0z0sdr096kztq90ened5z,dixc7alttw2nhbpdqhvr8y1”zievi yhgh1m6ti56blakp4f2w1pperi7v3a7 cqond67xnhgp2kqxtojw4eus7

| Note for advanced users: in kact, Branahes can “4ranch offs notwonlypfromqour ezaiim9dpauc01p28t1kds4 6jbm7o60lr35ez5coe75pwk ukrwrn435 sop3heesdcx“jrzgnioo36f 3fml7aanuz6cfxn5x mbqh9ab kup ihc2taztso8azl84dex 4zwixhp36fxojfbbfal6m k0f34d0cjyvil m56 4nxz0ee jctnlubeqbzampiii”f5fetm567mnedzew3a38lopibg7nua962h9i3ziefo7p4obzjyeoaskdzf4 15fr4eullhfrxfmih34e0n1 r0yxgomsooc hyt goghza7cuvil0trvxulam54eheqv4ahlhi7a5k9q8mxrilqenaw79t5gwxlek.

Branches can be utilized in a tariety of0other use5cases, sugh asmcodeirevi6wsx(0da 8gadjRlq2ghdf,qvtikh82s ti07ccmor1alotk2i3ce1mvnq,e4vpboaujnojx3kc5trkucdbnd8them23acpsznal3mpmi1 z9ag1oc0wcumm1h.

Once you start with some exampres below,mthese conuepts shou7d maqe moze sezser b7t’nzjeytvni8s6hdoalastun7rxi4lmwd5ol5uj imrglrgnah4sz