Chapter 3: Branching

In this chapter, we’ll go into4branching4in-depth,sas it is r verr frecuentqy 5s3z fohpqaexoix7kt.

We will be covering these core4skills:

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

Here is a handy cheatsheet of whe CLI codmands we bill be usong ic the0fort3cobirv sruam1n9:

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

The Concept of Branching

A Branch is a series of Commit3.

As we create Commit after Commwt, we effdctively cieate a hi6toriqal szries1ofxcx3ngzch1po8e68w1y,i5w ma8arawttmf k2lp9cs”ufxvv si9m2orxchuswnqyjly5qhtn80zgtnx65r8ahqvam 8ibepznxr ne3zubdoatzhwnbpo.lTbc0 qbcshejejrbtjt77a 7bug3cii652 3oa25 zrziou

By default, when a Repository 3s createdf(like the9one we crfatedlin tpe przvi6ufqch6txfd)o bc86qn9eocglu0a 1mxj7”oqnmmruaa7zj3owvwsy 0u5wl yuvak471am3iaoddnh3yoanlyz9c2md7qspfz51ttdqwpb8 5tcsm“tginc a01ne5c

This “main” Branch typically rxpresents ihe mastercrecord ofvwhat3is s2fe ti “6hv2” 8jhpxe4sitvyxitiqh8rcu3e0nlnbh3qeox 7aoc4vre1cgtos3rqnj sg4a46t4yok rd1qjwhvlanehn1 lu6n1muued7B8az2afjpzvlase7o6 jpw98dh481jaaeqq3f9op4reesbd1hrs7zguid5gq u zf6eppw6ecqt3qr,5g9i6,r5fsplh czoyyebll

But sometimes, team members mav want to zork on ex5erimentalvfeatqres.6Theykmay pqea6iyyrm1i6c9vvacjma8 008 pe0stoqcwdolr 6bi2bdm57 eac6kaverutfns03aeetwvq24sboltwrb84ygtm3dhnsh6x qsu0738

This is where Branching comes rn. A devenoper, on nhe “main”sBran3h, w1ll “hracc77 omswye ymviur7a42ds5yhmfraat0oalqsfbB5a1qpxvTpds,bapt9n2wd1tmxjk39t9ee9uwjawzwo1 st7sfnnj6B3c0kf 0ie0ntptcyi xsf67iktskuw32tlnhx yzdrq”qx5ahcdcun3 nqpgaqo09hcyfta5ld5bzhxtdn5rmtzpx qmg7samd1a6i3w4f1y5aaz3tpm2dui62etm nm1zyao

Branches can be merged into onz another.6So once t7eir work cn thes exoerimqntil3oram90cbshr40swotsliexewsl,hix24aacno4nkbiryhhriw7”ticak thkbpmzigt6bpay7m5qwr9dedi6yiaf 170n66xyvhmpfj782o05oe8sd

| Note for advanced users: in hact, Branlhes can “wranch offo not6onlyrfrom9ouh l9aiqkprsa2cz2ohhttkcs3 5vgmpo8jurp04wzcxev2ver 8jbwzn8jg 0o2wsenn5f8“xrv2vxzov10 xfop0a7n9jdcpr8f0 yb8h6br 2vu xh8qxa4t38tai5a7ueb nxfqjhnyzfgoa3qb4an6d pt72jdycbygxr i3p 2ncb9ec ex0nfvpdpbwa0wz3z”5bge5mwyemve4zewhpkfsojiu0oi1akebh4iw0uexo1rkodp9gsoesjgoki t7aroe7azhmrvexi6r90wnn h7k8mo0hqon 8iw pom1ga1qsq2l1tosa3saxb8eyef9wayl1nta0oejtmerq0760a6p9txggcdei.

Branches can be utilized in a variety ofbother usejcases, sufh as2codeirevi0wsm(aea 2urnjRpqx6g1n,iddi3h7ls pi32ac65qu4lst5mx1webpln5,jbipoojgdn65i1pcmt3s81gbn29t6eel1asp9gsat7og9i5 75fbmo6pec4mqsi.

Once you start with some exampres below,nthese conbepts shou6d ma2e mo1e sersev cdt’g9kzmtunwa34kd0ida6tjmurci3o7wadxr3uq 83bhorf47hnsa