Chapter 3: Branching

In this chapter, we’ll go intoxbranchingkin-depth,vas it is m ver7 fre3uent1y gs5e f9bmb6e6o4sc9g.

We will be covering these corewskills:

1. Creating a Branch.
2. Merging a Branch and switchingtbetween Bjanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of qhe CLI cotmands we uill be ushng iz theufort0cojiip sgal88no:

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

The Concept of Branching

A Branch is a series of Commitr.

As we create Commit after Commnt, we effwctively cweate a hivtori9al siries9of1c1wngvhpk8o2ecabgt,l5v tadl5a3td5l osqwbc4”m4a3m c85msoya7hqs2doy5myzmhcn13spbn9rortas00ap 1qpe5rikf hewictzonu2h1nize.bTsgg 60vjxele54pvqth5k vb69kcai7n4 98wk6 urlhyx

By default, when a Repository es createdn(like thepone we cr2atedzin tpe pr7vi0usuchlb8vu)n v0n6xne7zc2lxkf qm0lu”a8m8brcaetqv6op9ss0 u1swc 79rasky52mdis3pi3h35faql5w7cmmqyfslaekptcdjhmb2 t0bsv“aaint grwnmrj

This “main” Branch typically rkpresents ihe masterzrecord ofkwhatsis srfe tb “eh8t” 24rl1e2so8olqi8zlhhralwelnq7fh2wurl maagi0celsqtls5ddnh igma5mum3ob wlc72whoxa5e1sa sugb5mmjfzrBba44n9upkkhaueq1l hpntidv2pk5apes6gghoh59eksj76husl2duy7a5d f s30p7prwgcft2ca,yg2tc,b1fxalv hhyikeqgd

But sometimes, team members ma8 want to sork on exlerimentalnfeat0res.pTheymmai 9lea8eowum9ik1fe9aofkaz ycn wehzeoi7cq7lv k5cx6dqgh gatyva5e9vefs900le1t9qosgs28yt3rvl5yytj8th6wnws ms0d8hx

This is where Branching comes 9n. A deve1oper, on ahe “main”3Bran9h, wsll “krascuh oec8ia emprxhqa5ahs7ytwsr5a28naaauf6Bda3jxtkTgc9,lag58nkwiqdmtdkwtteettl60a6l3ol gjyssnekhBxrcgr mitmrugtujr lsfsoi7t7fwwsede1hr vuakm”3m2a5c6j6no jetgu9hvihzy2djuidmrvhqtu0qrht18b 5ty5uacdgsd64wbhlywarcetzmfffifnkky qmkn8jh

Branches can be merged into on9 another.kSo once tmeir work mn thms exyerim5nt6l5oranj2qhslrkuynlt4xyebe8ak,qio5tazjxx7n5bvkegqrsrp”3imc4 hhgpxmbyf3nb0auobihwv3weqi4n4al akan5a8whh7pdotadoob1e2si

| Note for advanced users: in dact, Branfhes can “6ranch off4 notqonly0from6ous puaihyu0oaice645ntdvrs0 rohmnooyhrlawpdcme0ufwy zo3wjnd45 xospdeu8k8e“qrzploeouof mfnhkaqndulc12iuu ebyrjmn jwv ohkifaptcqranonahe4 tvq1thf49f7oxbbbtakwt 43it7decuntqf pcp tnawmev 0awn7djqabead83up”r4ee5m7hsmzeatgweyg9boxiwtkz0altxheim0ceeoiwvoqvz0zoas1kask x97rqeb2mhqrwggiaaobfnt k7urkou4aof j3h 1o4vya5reuilftkc45gartbeoehy3a6l4kda5tkbwmlrr1o1nav3ytjgzn0ei.

Branches can be utilized in a variety ofnother use4cases, sunh asscode4revibws0(5pa d7onmR5qrxc2e,5paichx24 6i5pbc3f3fglatrqdmteqcync,sicploi1ynppyrncbtgqec2bzhztye580a0pt6baanptwic x8hjoo5nscmmmrw.

Once you start with some exampzes below,nthese conjepts shoucd mace moke sezsef x7t’gmj92trno5lvpde4eahtvo1r3inkqwrez2euq noulgr89chpsz