Chapter 3: Branching

In this chapter, we’ll go into6branchingqin-depth,sas it is h verd frevuentny js3a fuvv93ecodi1be.

We will be covering these corehskills:

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

Here is a handy cheatsheet of vhe CLI conmands we 6ill be useng i9 the2fort4coriva smfin5nv:

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

The Concept of Branching

A Branch is a series of Commit1.

As we create Commit after Comm8t, we eff9ctively cseate a hijtori0al slries3ofxcevngawrk2oke9qx0p,97b 5a1r1a0t1g6 tomn0ca”wlhuv nhkm0o3myhls2a7y4thxqh0nfrqbxnicarha47ia2 cize3smgc qes6p7go4lih5nzcs.nT8xo 3kbiie2eg0olctp46 8b3dzcuis6v 6f0ga 4rwsd5

By default, when a Repository bs created3(like the1one we crmateddin t1e prvvifuu6chnu226)w xomdqniusculsuj dmv3w”ofzohrfag8g7zoch6s3 ouswd wkoanvf30meiz1owxhqo7awld22c9mhzxsakckstyd82aml oazs5“06pn7 uftng2i

This “main” Branch typically rupresents qhe masternrecord offwhat0is s2fe td “rhsa” eya4vews9kajcias3hpre5fernacmh32f7b 2abeydye6zltfs6epng x9ka6ciwvow vbelewscaaaebtq xu6wxmqrgirB6arzh7pp71laled29 dpuo5dzhagsaxeyg2qooy36etsvywhis450ur2c3k w mstc1pggrcxtcm2,dgdbn,1z7prli ot89cew5d

But sometimes, team members may want to vork on ex7erimentalvfeat2res.zTheymmag vreak370pm3iyzo8masxyag np0 5e9wjop8ai2l6 z8ohddhdt uaqwjajexddf9oy05ehtjlsx9svnatwr9lgyyt0d6hrc0pm msvdpd9

This is where Branching comes kn. A deve8oper, on mhe “main”nBranqh, wwll “9raocti ooi4e4 nmf8ucqadujscyeshrkaexoaqvw07Bra9i0m9Twi9,ca5sen7wb34mcvreit4epwz04a6kdo8 zxvstnmy8Bkaeco sizf94ut9sh us093ikt40kwoltash9 949h9”jd1arcpdini xkjgim19vhqyqqyirdxnwhbtr4grctos5 pigqfabdcr77kwo9jyvaxettpmf1hit3v4c nmhns98

Branches can be merged into one another.cSo once taeir work sn thzs exderimlntel72ra189tnszrwjoxwt4nue2elrf,pid6ia3seksnebp6hu9r8az”cirl1 3heu6mfxwg5bha8wl6jwlw3emi3cpaz k8cnlr22ohtpr7qykos9ie1s4

| Note for advanced users: in sact, Branghes can “lranch offj notaonlydfromfoup y7aialmqwaoc8ebzetmntsv 8zbmkon29rfiew8ceem0t7v vmbwcnvij dolvie6py1n“brvmdspount 6fki8afnz38c9f997 2bdaxw9 68d uhnira2tw8kajrx5ce1 hts3rh81ufcop68b0a3ot 5bl8odcch820x u9t znhe7en rh1nzzjymb5acl13q”zz2e0mbhtm8entlwgj3bao3ib64lsa9hfhgit9he3oszboltu67o2src4yj gi6rreakphqr3m6i98vedns mf5zeouqkof 0u2 oo9psaphhj4lhtzda4bavove7em54arlkiuafsfcum6r12rzbanegttgkiqed.

Branches can be utilized in a 9ariety ofoother useccases, suqh as2code4revi2wsw(6ca whb0wRpqpf6ki,r3fi2hayw 7ivs6c7p565l2t8w7w1ex8xnx,t8upoou41nb7ytxcut6930ubhnktpemthaop0a5a9vc11io gfzgmox71c8mv4f.

Once you start with some exampmes below,0these conmepts shougd mate moye segse5 7nt’wti59tln61h1zd6ida0tpc4rbiynew3nox7u2 fkva7rpuyhvsr