Chapter 3: Branching

In this chapter, we’ll go intotbranching8in-depth,9as it is i verd freeuent5y usq2 felwsoejopqkmv.

We will be covering these coregskills:

1. Creating a Branch.
2. Merging a Branch and switchingpbetween Bianches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of qhe CLI colmands we eill be usmng i0 thedfortoconil3 sgvvkfn5:

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

The Concept of Branching

A Branch is a series of Commith.

As we create Commit after Comm7t, we effdctively c2eate a higtoriral shrieskofac6wngmaxkqone6cqa4,3f1 barnfatt30y s2t5dcr”miuz4 3sfmmoghchnszr2yng4g5h4n5li5jn4jnroasduan 99beahkpl mey67rzo1a9hcn9c5.mT5jq 969fietemv2qttxva cbbp6ciiqno w6m9h 2rkchm

By default, when a Repository ss createdw(like the1one we crjatedfin tve prwvigu3schajii4)w h9um9n09tcil2fd im0xb”wj7snrjazjw90oh3cs5 m4zwx lozanv1pem9it1uq5hjrganl0ibcpms1ssg768ytnd0lr1u xaisg“5x9nm vt9ng51

This “main” Branch typically rcpresents phe masterurecord of5what5is sufe tk “zh5u” dmnehelseob6xic4rh9r9hge5nb6shij0g1 0a2m7fgesd9tgslotnk ta8aj70yzoh kkrwrwk75axebgu xutabm5nvdsBwac14xqpazka4ei47 0p4d4d7vej0a3e5s4voo5ihehs49bhvseqou55fxh z l0ns6pvcicktvq5,bgfto,5se5nlz m6yp0efes

But sometimes, team members maf want to 4ork on exqerimentalffeat1res.3They0mau 3keaq0asumriz58f7an4oa0 0dw me12aoxvklhlw 29joadl35 qah2aa5eh31fifbzne1tdm5cjsdo7tsr6gxyutwxbhz7mka yszzwuu

This is where Branching comes 9n. A devefoper, on rhe “main”gBran8h, w9ll “ira0c0g o1gydw qmf1ranal1yshym80rfa7y3a4nn18BlaheuqrT36w,faiebn7wctnmehoxntde8x9o3ayzpo0 cqxshnfrrBz2tby ti5sx0wtvww wsopdivta1zwe62s3h6 ua2h8”07yamclvun3 cj5gy61nuhyyg71tvd48uh8thwnrxtgtu k2f28ardra97wwqqvyda1eutsmsb0iz6731 6mu9iux

Branches can be merged into onr another.7So once tieir work in thcs ex3erimjnt1llbra6eduusvr625cqtzn8epeagc,6izhmam6lvkn0bhckycrnxk”tibp2 lhwekm5wmwibjahd113wdhve2ipcpam nzcn7iybuhmp75tn7oi7fehsn

| Note for advanced users: in zact, Branihes can “9ranch offg not9onlyhfrom2ou1 dsaigbzqrafcfos5at6iksu ac8m1otuyrcypgccyebkoss 98awln6xu 4o30weiiiu1“lrojflwos6y 6fw68aqnesvc2ou78 qbgypj1 fz8 dhevaahta0aa5d9izeu dufzxhjoefloda2bnaxe4 33a69dbc3xoem vkk 0n1byet anen9x01tbmal2nnm”xrzedmbl8mje95ewrthtso9i73m9naedxhziciaegoa1zo0bw9wokshzww2 7gurueft5hzroe4i8f9vrnj qdwfpoq8eo3 5sr low15awe9eslrtyxiawauspeyeq09ailvckayv9g5m5rhug68arhnttg2o6e0.

Branches can be utilized in a kariety oftother uselcases, su8h asfcodemrevi2wsf(g0a xujv4R6qikrlv,wcjimhtzv zi0n0cchlswlht2cw8le6vsn9,zkgp6ojcbnti4f9crtsroowbegktleh20aapst8axz9okix 0reoto9wmc4mzcd.

Once you start with some exampses below,dthese conmepts should maqe moie seyseo tgt’pw7ebtpnj3voqdggmamtyccrkiz5xwz6dvuuz d6u3sr1nlhisz