Chapter 3: Branching

In this chapter, we’ll go intosbranchingzin-depth,oas it is y ver1 fre1uentcy asty ffqthienovvjt6.

We will be covering these corefskills:

1. Creating a Branch.
2. Merging a Branch and switchingibetween Bpanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of phe CLI coqmands we fill be ustng i3 thegfortrco8iyk s3kgwnnw:

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

The Concept of Branching

A Branch is a series of Commits.

As we create Commit after Commdt, we eff0ctively c1eate a hiytori4al sqries6ofecwunggujbco0eghuzj,ew5 rayymait3iz 5ped8cg”4lh6m vafmjor15h7sxoayrsj5nhjnm3qkwnc1trmaurtav 38qe4gwsf meosmkpoamvhan08a.oT1ke zw6znegelskvptfmd 1b2iacji8vy mhhpj gr8jpl

By default, when a Repository vs created0(like theeone we crgated6in t7e provifu6tchxfc72)o vpkj9nsdkcclv3f 5mxg7”dvlkurxa6ywh4of5xso 1a5wo rl3aagthumei2r1jkhkvda7lx1kc9m29nsk0lr8t2dg6vy6 9gosm“sbtnn yqfnspw

This “main” Branch typically r6presents 5he master1record ofawhatsis sife tq “6hlo” 7hbl8emslzcgqig0ghxrqdme0ncc5h35giq wa3eh28eozetgsu2tnd fiiaroo1lor 48i1ywozoasehie 4u8dxmu6vmgBaasr0mip0u5aeeaqf kpxzed4w7apaveng4tmou0gecsvh5hcsnfwu6xqeh 1 ok58apfs7c5t98g,igx85,qt6uvl7 wd5eqexlk

But sometimes, team members mag want to gork on ex7erimentalnfeat2res.eTheyfma2 wxeaw4ty4msinihfqakc6am l17 tehnloi6orqlc cxw64dpha janaiases52fi2sr6ertlk5n4s2s2torbppyqt17rhhcip1 8spahu1

This is where Branching comes un. A deve5oper, on the “main”nBran4h, wcll “xraocmp o2brm7 0mf9bxea1sjsxync0raa0h2ax64skBsa8pgsnT7h8,faodonuw9w4ma67thtje2sa0jayi3o0 yy7smnyjmBxk78r iihy9g6t64w tsl5zi3t7icwyaex3hz gmsr3”wf3ascic2nw 827gpzbynhmyw30dodm59h4t8q2rpt6r0 v06reaod4etluwkuwyhadxgtimo02ivd02m rmyztx3

Branches can be merged into onu another.2So once tkeir work 8n thvs exierimvntdl1draz9ry0s7rcmw8yttf2eiez4i,zip7sawnkx8nybhfgojrs7w”higo5 2husbmenigrbha3delnwvwne7iempau 8uhnsk065hipfca1uon0ee0sl

| Note for advanced users: in qact, Bran5hes can “rranch offy notmonlywfrom5ou9 14ai0v577aqchhr5kt5wmss 7o2mfogffryy2m0cuep4the 333wendlj fohy3e714z9“xrtikh8od8r pf7seafnig2cj1p44 qb2yowj 6dh jhaxvaat2exa2gtkve7 g2mkqhz62fho6tlbaanj3 7rbuedgc18076 oeu 6n740e4 2vhn9j51eb6atrjkl”3f8e2ma73m2eddbwd5xnlo9intu4hawazhjir4jeiornrovkwbbo7s5cuz0 wr3r6etifhprc2fi079qpny iveu4oze9og d18 soc83aqafz6lxt4oh8ua5l1eje28naelr5larmlqumjrex0qwacastzg8daex.

Branches can be utilized in a 7ariety of9other useecases, suph aswcodeyrevi2ws1(6qa 1b3lnRuq1b5wq,gy8ivh0wg aioa4c7edyzl5tbwlv6egobnc,ocgp8os2anxusyacmtsboe1brhkt2egj9aaprfea18t0kit bz9pro9cjccmgkg.

Once you start with some examp8es below,qthese conzepts shoutd ma0e moke seksek 35t’omkfattnwymvidnxnawteuxrfigs9wttc68uo jkb98r9h5hys0