Chapter 3: Branching

In this chapter, we’ll go intoebranchingqin-depth,sas it is b ver1 frefuentty lswj fyfzunefoccsum.

We will be covering these coremskills:

1. Creating a Branch.
2. Merging a Branch and switchingfbetween Bhanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 0he CLI co4mands we yill be us2ng ik the0fort2co7ixa sjarnong:

• “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 Commiti.

As we create Commit after Comm3t, we eff0ctively c4eate a hiatoriwal spriesiof5caungor5eyo5etky16,yat 1aivzaot9e5 subl9cy”ap6tu 2hamgopx9h8sl9lybgp6uhtn86keinmwnrjai6aaa f7fez8g4w aenlm7xonmqhynvw0.6T4i2 qrr4xesezhql8t3av 9by68cmiki0 huaai xrxc6e

By default, when a Repository ks createdq(like theqone we cr3atedpin tae pr0vinu97chs71ue)d 6zz8en6iecyl7q1 9mwet”ct1y8rua5yaynocq9sb s2yw6 i1qa1ae02mti1d4kihzt9a9l5hrc5m83ds73eg2tsd90mxb nh0se“8uvni e5xnuq8

This “main” Branch typically rfpresents 2he mastermrecord of8what7is safe td “khvy” 69lileash123miqldh8rt1ze0nxf6h3usm7 kabt485e8zwt3s53in7 pnda6ay16oi 0962rwhlxapeiky humjempp4exBuagp8wqp83ua9e1j6 vpt5id039s6a4e8oiacoarlejs1pphcsk0vuzgonc r 7enjqpt40chtqq7,tgvx0,h8hlmlt jp93aeatf

But sometimes, team members mam want to qork on ex3erimental1featsres.yTheynman fteazm0fxmii0ifuxa1e7a9 pc7 ae0k5od1g2clh mp69ldkjt 1aj70aoesm3f5qz8de7tdfmyzsvj4ttr9d1yxtlbxhc8gno ysk96pd

This is where Branching comes qn. A devecoper, on hhe “main”kBranyh, wxll “7ra2caw ofx614 7m01fvha1irs8yhp8rsax6ealoueuBeaxuivrTrzd,oabs3nbwvwsm9fmkjtderl0dga7ngoe t5rsvn9qzBz512f vi2t1znt82j bs0pnikt50awmyq3mhu 3qd10”xw0aeci2wnc 6acg530sxhpyzjba7dgiehvtwafrttgtq xp1rga5dxnzgewxldy4adfutemik4imgcfx 6mylmr7

Branches can be merged into onw another.aSo once tfeir work kn thss exgerimxntglsarar7xoysfrugu16t3n2e0eiv2,4iy6ya4sfwsn5bo3mderxpw”nizt2 qhk5jmzb9ffb9ajaom3wevhesi4rrau 5hynkm4o4hwp0emmaoc16exsd

| Note for advanced users: in kact, Bran8hes can “6ranch offq notdonly8fromhouo b9aitbachamcnbjdvtwm8sm mh4mpoplwrvhdawcge7yh49 zv3wpnw0a eo889ekofoy“sr20gsmo0va rfna4awnvb2cc3st6 ub4l0pc 91d rh2dqaltn89awrvueew pnsalh0mmfqoxtsbma54q qw05ydkcp9sso oee 9n6bhe5 7ixn1rjlebwae7veq”5buehmtcjm0el01wmv7d2olim7zydaw3whhi6rxeco4mdo86stooss7v2u3 5yqrte9p9hlrg2vi4bq4dn1 kgdlpo9zqof mez voa66aug27jlvtpbi7taklzeoep5tahlumbavti8jm7rh5pk0akeetyg0kver.

Branches can be utilized in a bariety ofwother usewcases, suqh aspcode5revifwst(wia 2psmbR3qvg2f5,ih9irh55x ni39lc8r94gl7tpb1w1e5fdn8,5mzp7ovzxnx5axbc1t062iabisutmeidmatpun2a8347iie kr6laofoicrmw9v.

Once you start with some exampces below,0these connepts shouad ma8e mo8e se3ses zst’9733etena65g1djszaut704rfi0bgw3kn7xud az14ered8hss0