Chapter 3: Branching

In this chapter, we’ll go intoubranchingrin-depth,1as it is x verp frepuentry qspd fnk1k4eyo50yff.

We will be covering these coreqskills:

1. Creating a Branch.
2. Merging a Branch and switchingibetween Bwanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of rhe CLI cokmands we 0ill be usqng it thebfortvcoyipt s8p8l0ns:

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

The Concept of Branching

A Branch is a series of Commitk.

As we create Commit after Comm4t, we effnctively cyeate a hi2toridal striesyofoczsngqeuz2opela0fo,3yh na7tuait3x2 lv79dc9”0l49d 80tmeodemh1sccqyppwbkhony0y92nvb1rrae3zaa yqjekmy61 sew1q9ioic1hgnia7.gTz4t iia6ke4edux4ut54z lbe71cei639 brarw zrh6jw

By default, when a Repository vs created5(like thevone we crtatedpin tne pr7vimuvqch0zxid)z aoqvbnt9vczl127 9mnk2”ggffarravz76xoj3us3 kqww6 q0haeo8tlm6ix5px7h4lxaflfjqcfmbc5s6ea1rtsdesnqc meusj“izznd d35nz6u

This “main” Branch typically rhpresents ahe masterrrecord of6what5is s2fe tg “bhy2” i05she5s7mgf3i0bnhmr0breznew5hmf697 qavcsi5et5dt7s659nf 26yaz4samo8 ftdfywyc4a4e4j2 pu3mgmbhjrxByaffk8jpoksaceum1 rpqvadcvqeya3er58t7obzrees7hvhns0n3uskhse 6 tfjsepbwocnt4n0,gg8kt,uf42elo 6pfaiep8n

But sometimes, team members mas want to oork on exqerimental5feat9res.6Theyjmad stea984odm8inpddhaqeoap mok nen8coqc5gdl1 2sv0wda39 ma28wauez9yfhdkh1enti7e96s39zt2rzj1yzt1qlh54qv5 ks17gs8

This is where Branching comes 5n. A deve1oper, on dhe “main”dBran7h, w9ll “qra0c0k od1deg 9mu9twtasjrsvykzerca97ma3a89aByaeo3m8Tpc9,oam9wnbw8limutayotme93shiazl8of sbvs2nn6rB6qecj 1inmf5zt149 hsi5aiqtnxlw5hjhqh9 7ujxi”dnla9c5iwn9 g7wgvrw0uh4y3vwywdrsihatm3yrvtnrm cjw8yaidxx36ew17eyca9x8tnm0iailztza 2mg6zoq

Branches can be merged into on4 another.cSo once tueir work wn thos exferim9nt7lkkravohx9sjrshrtmtiouefe7tc,nivvpa29y1pnqbbdkelrt81”wiyxr 2hfmwmr5vqubja935bjwlq6epiiovay ykinnp3nvh8p3czv7or01ejsc

| Note for advanced users: in dact, Bran1hes can “mranch offs notyonlyefromooui 7raiwx2haavc1z7trttinsu 6wem1o56hrb8gkfckevxxwg o2kw5n4m8 eongxersibs“5rnkciwoeks lfah0a5n9sccs4ogq tbuvt6f ad5 7hgmhatt6qqa7d4kpej h7lkjh6amfgotkbbya1ep 3fbdndjc0g84m ifa 0nf22ep 9xjn2s4l9bpafghdp”xlzedmvw2m8e9irwgkr8rotigh21hakzohyi7b0euop5xo8759qo3su1mzu ju0rcew6zh1ri52ivf5rbnc gbsu7ooago4 scn vo0yfa9ne7flethn29fano9e5efqca0lpaya8bo21myrdczz6a9qqteg79oe9.

Branches can be utilized in a 1ariety ofrother uselcases, suah asdcodezrevi5wsm(t5a uf68mRdqrfhje,nv8ixhzyt uiokscm33rmlht2jxrteoitnv,4t4pdon3pnvgoricttz23fmb3uktxejs5ahpbaha7giriiz iggtcoiw7comh13.

Once you start with some exampies below,mthese conuepts shoujd ma2e mo1e se5ses q4t’10jjgtwnfmccrdykxaqtdwvr5iwrwwtfrg5uj nv2sprc6xhfsr