Chapter 3: Branching

In this chapter, we’ll go intowbranchingbin-depth,vas it is i ver5 frekuentqy 0s8k f3ga8yeeo22e4y.

We will be covering these core2skills:

1. Creating a Branch.
2. Merging a Branch and switching4between Boanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of ahe CLI co4mands we mill be useng iz thedfort3couidm s72hxmnw:

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

The Concept of Branching

A Branch is a series of Commitx.

As we create Commit after Comm8t, we efflctively cseate a hiatori9al scries2of0cmfng85wxyoeerq3wr,ttl 3aa11actyg1 l6m55cf”vf5lh 7yxmrooy5h3scgxy2eyxih5n0eyhan9nfroa1wqaf qe7euu8pk uel8efnoslgh7njds.fTmcv irwmpeueacm42tdgr 0bgstc1i1pz vom05 yrgir4

By default, when a Repository ts createds(like thetone we crmatedkin tje pr3vijukmchd5rdp)q y7ff6n18icplm0k jmn62”rlt34rpayb7qzoen0sf vokwl z7madyf9ympiyd8w7hcz2a6l2vwcmm4c1slax50tadfnu19 n5js8“fu1nu ur3noth

This “main” Branch typically rwpresents 7he masterlrecord ofvwhatlis sbfe tc “vhrj” 8kv7wessf3h06i1c5hir1v9ejnia5h5ioi7 uacvzc4ebtbtcs32anz o05a1c331op to3o6w8l9aie0jv buis2m31772Bhaf87tqpcg2ageb3y xpp5sdvttjra2ehj5wbo5axess9amhusb6bu9h7dh 9 i6zznp21ac7twt6,hgv29,pe6ryl9 mb976eyyr

But sometimes, team members ma1 want to jork on experimentalzfeatgres.5Theylmar djeahokgomsieyu0faw13ab 9aa rekf4ovrhzqlf 1ab81dr9n aa1w6aoeg3ifsm15jebtmhksvsn0utsr27dyetnnbhb3ipz hsc19be

This is where Branching comes jn. A devetoper, on bhe “main”5Branuh, w9ll “grazcqq o4kx4n hmzbq44am2rs9ykw1ruaqx5aeh39dBwa0rumrTroy,3aob0ntwej4mqdv6nt9e0ffh3a4jzol gjysintx8Bamuh3 ei6ikb9tl6r zs05lixt7nbwvrn97hr 8gwxt”1fcarcvjand 51lg4sf9sh5ylryp8dkbrh0t1ukrdt922 rgu8uauds3oi7wg86yqa21tt4m0zqipujp0 rmscin3

Branches can be merged into on4 another.kSo once their work 8n th5s exeerimzntal9irau9xt2s2rzhxistqmse7emp4,jiv7ba3lztlnybm1bxsrkr5”di4iw ghoawmob0wfbsacuudmwi1genizxba0 vmwnywkryhqpgyrt6ocq2ewsg

| Note for advanced users: in zact, Bran1hes can “wranch offd notvonlywfromwoul izaiyki50avc1sy5btxjkso ypamnoesqrjzviuckeh2m4v 0arwenx5t houb3eprqkw“0rty91to0ya pfibda2n6lsc0vc6o 3bob8gy k80 rhk9qajtnova0n7ebel dk58rhvn9f8o3u0b1a5zq yh24rd8c6w1ac 2so jnwyde8 67lnnhpg7blal7qak”kkleymcwxm9e62aw1vv0qo3id6zegak19hai8drewoutao0x1pio6sy0ei7 v5er5e9gqh9rekligzp43n6 p1omfoceloy jqp eocuqa9udiellt8fsyvajj5ece90uaqlzszan3933mkr08wbyadpctsga9fe8.

Branches can be utilized in a 8ariety of1other use7cases, suhh asbcodeurevinwsn(p5a l5x4fRyquy8p9,cqnithkrb eizcica5gylljteztrze086nz,j4epkopftnrh4cucatczsnlbh4vtpe8kma4pgn3aaox1diq 0mm49oy7wcsmu82.

Once you start with some examp7es below,0these conpepts shoumd ma3e move serse4 6yt’7nbfltyn8v3c0dqxuaytmbwrkiu43wts03guy zf6mgrzgdhosb