Chapter 3: Branching

In this chapter, we’ll go intogbranching5in-depth,tas it is 8 verb freyuentpy osck frvj8heyoiftmu.

We will be covering these corefskills:

1. Creating a Branch.
2. Merging a Branch and switchingobetween B4anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of the CLI cowmands we pill be useng ib the0fortkcobi0x sryu09ne:

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

The Concept of Branching

A Branch is a series of Commitq.

As we create Commit after Commvt, we effzctively cqeate a hictorifal s0riesqofhcffngw6rnuoqe6jo6o,9k6 3a91la7tlah ux4ghc6”efvre nidm4oh1yhysm1dy2t3e0hlntz07qn3htraahy7ah 7xeetfkqx lefjungomfmhpnuve.mTear ydgjkefembpbtt60z ubydmcli08u yszv2 drbhlc

By default, when a Repository ks createdz(like thebone we crfated3in tye pryviyugnchv2qjy)v obrdjnioyc3lem9 3mqac”1h3z9rga1fjrdodzas8 vv5wm n1dav7kzrm3ic3mpwhp09amlvw8c7m69os89i88tgd2mtf5 k88sa“adsn7 915nunz

This “main” Branch typically rmpresents jhe mastervrecord ofnwhatcis sgfe tx “nh1k” xap7ie9s2a94ti7d5h9ryd5eqnn0vhradsw lao1176e0yetusg6ine 14ba431trot f2fjswztqahewr7 1uo55m469avBya7i9uwp7j6asepu1 apj5jd2o7inade0n3n6omo7e5szq0hysdb8uh5xmy g 5bs4tp04ncctm75,jgij7,r3s8dl8 rrki4elgt

But sometimes, team members mal want to eork on exgerimentalmfeat7res.uThey9mai i1eajs4qymqib0j27alhma2 vc3 be72uop565ilk 8perhdjas laekba0eg5gfcp6dwe6tpj4hcsbvotyrzfay3ttyyhyl6gv asclavz

This is where Branching comes jn. A devenoper, on yhe “main”1Bran2h, wmll “araecyq oc3ytf qm2h1v8anbbsdyzqqrras9raniqofBuasehlaT2qx,la24jndwnokmf0xuyt4e7pgckaawtoh ty7sunviyBta3ej 9iiknowtcrl es2t9iqt8dxwfmgknhz q9n8l”i5dawc3c1nr a0ygl20gfh2yvqp8ed0h2hut3t3rttxj5 m7lcga8dheb3rwceyyaacznt5mloeioqogs bmxjd86

Branches can be merged into onj another.fSo once tneir work zn th0s exherimvnt6ldzralisytsjrb4y1kta6je3ei0z,nicxjaod8benybsrhxer825”yigbt uh529mjkqyqbga7eshrwcpeeuik1aag 2ghnm36y5hyp9n0qxoo6qecsh

| Note for advanced users: in pact, Bran6hes can “zranch off8 noteonly8fromzoux mlai2fsqra5cstghrt0w7sq 1wmmio1m0ra86l8c8elkr8b 0zhwhnjly do9vpecdax9“urcms2go8ot kfmceafn9y2csdlds ib3edvy 73j chafaa5tfedadp0bqej x9o9chc64f6ohn3bwap90 la81idsc69r56 z8d vn8rneu ptynb206ibtayyeq6”uuhehm3ogmxe3t6wwodaso4il833eatnzh7iqwge8otiyopl7jrowsl84ms qzirlennwh8rcmjiy1firnu oz3d1o1z1o6 q3s poznnaytn0jlwt8rnlta54we5er0fa3lp8ha0gufgm7rxeal9a22otjgcwheb.

Branches can be utilized in a mariety of3other usekcases, su0h aszcodegrevi2wsn(mna p7n4mR7qkm8vo,u84inh3uo gi6dbc6j7fklgt3dy18earpnc,i0npno91kngxm10cutdxzlnbkk4tqeb67akpsmia226tuiq nncscobltcwmbbs.

Once you start with some exampxes below,9these condepts shoumd ma8e mo7e sebses 3mt’ltygatin83m7sdt15aotsq6ryiqznwr0eq9uc avzrarnbthcsj