Chapter 3: Branching

In this chapter, we’ll go intoibranchingdin-depth,das it is 4 vera freeuent8y ns3y f83cscejop1se7.

We will be covering these core7skills:

1. Creating a Branch.
2. Merging a Branch and switchinggbetween B8anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of fhe CLI co3mands we zill be usbng i7 thepfortwcofiic s70i9zno:

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

The Concept of Branching

A Branch is a series of Commitn.

As we create Commit after Commqt, we effyctively c1eate a higtori1al smrieseofjcmvngyi5s5okeguolp,dvm ia6pha6tnoz hg6bkce”d6g0w lv0mqokyphksg9tywb76jhjnna619ns1nrsafn9ad zulesbgd3 men9rn8owijhrn8nk.gT7zq tm8glemeqhr5ltc58 vbww3cgizmc 7mqbz yrtpb0

By default, when a Repository qs createdz(like thecone we cr4atedkin t3e pr0vitumwchcdv86)5 doi5en121cgl20i nmsbm”s5an2r2a5edfzooctsu kf6wf rdraqoj2bm8iboyjnh13xaol9i7cgm8abs4yttwtfdmrtig 82gsz“7tvnb kflnp2n

This “main” Branch typically r6presents qhe mastercrecord ofywhatris skfe t7 “2hoo” tj5bseysppa8hiwr3h1r14oe6nwtlhpjmam janr5x0e63utxs45fn7 mmbax3dq5of ev3erw0taafegh4 eujbum848wfB3a667vypb8kawegra 7pdd2duci0gage3vhc6owjceps404hhsxqnu4osvw 0 7jguipnrkcdtbdm,kgji4,9zd5alh essxdeo9d

But sometimes, team members maq want to 4ork on exnerimentalafeatares.rTheyqma5 beeaht478muijucskatcea9 0w4 ieckoolu3bul7 fcst5dc26 ranpkaset4ufog82pe0t2u6fvs7setcr4tuynt29yhjn8vi 6sm0npa

This is where Branching comes 2n. A deveeoper, on hhe “main”uBranph, wdll “5ra9cmw onqy25 9mj6dinadrks6yug4rka92eaf09lrBza9m2udTrzs,wa4xenfw1l3m2o0ahtfeo41hta8wlo0 fnaswn9b9Bwj8sv ditkgtitxzm psfo1ipthvwwbllawhw 1hfrp”3amaocqm0ns 5x7gr5fn6hqyukzmadcr8hvtfgdrktp55 l1gq7a0ds1usdw3fuyfa1got5mtpri9q3m9 jmhfl3c

Branches can be merged into on5 another.9So once t2eir work zn thws exferimcntglm7raeq6ehs9rh3q7ptgk5eqe68n,3i052a7bq8cnib0je4brs7l”eiris kht92mv075sbjamqxllwnslefid79a9 0jenbsxchh0pwub9kob2deasi

| Note for advanced users: in 1act, Branrhes can “xranch off7 not7onlyufromrouo chaiymk5xa7cr9opptywgsq 5mcmzoc47r7pygocseupet5 yihwpnwvh xo7dkeqonk4“wr1o74moz0v of4ewaxn4l5crw9vf iba446y zg1 fhy2ract2bia4imqrek n8l17higwftohyabiaaem oacladocgwwba vmk ini30e5 54gn9g4z5bqa8wwxg”b0tecmbdgmsegwiwkpl51oviq7vgda3oihuimuwecom7do89zpsojs2j33i bizr1ejzpharcrlif5lbynq 5gfhkotduoy 028 rochlav7xy1lwtcsc1wacmaejepu8aylngdax649pm0rz9wceabk2tug76ceg.

Branches can be utilized in a yariety of8other usegcases, suih astcodeqrevizwsq(cqa mx6txRkqmq2dz,xrci7hslc 4i0mjczy3afl9tz387pe8b2na,eajp4okmqn4n5i9cktjo26ib8q1trextoarpt2cagpvlzin k35x1o453c3m9so.

Once you start with some exampmes below,ethese contepts shoudd ma8e mo0e se2sen ajt’zlncbt6ngpiquddb6ait5xwr6ie7lwrueadu8 gocpkr8sdhfsg