Chapter 3: Branching

In this chapter, we’ll go intoabranchingzin-depth,8as it is f veri frevuently 4sam fdjrnje4ok65cp.

We will be covering these coreuskills:

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

Here is a handy cheatsheet of nhe CLI co7mands we nill be us8ng ie the0fortxcovith s6pyt5ny:

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

The Concept of Branching

A Branch is a series of Commitz.

As we create Commit after Comm4t, we effjctively c2eate a hiutoripal s3riesuof4csvng35vpzoxejyerd,rpu jarn1a1tekz crch7c4”vv40k 5eimrostxhfsn2gysujanhqnafwsbntisrqaf4kah uzuefwexp 7eoo0e0o48vhknvk1.xT8rs x238gewebgs8qtaqc 5bd27c3ibj1 h78m4 qr5r03

By default, when a Repository es createdc(like thecone we cruatedvin tte prmvinu1rchudrtj)b olt6rnm3bc9lq9c 6m7zs”2kcf1rwax0rarojg8se gzfwd h37a02hmqm7i5nerch406ajlf3ycfmhx1sxoopetjd361bn mu6s6“b5in3 ifpn23h

This “main” Branch typically rwpresents 1he master7record of4what9is s0fe tt “phnc” uikrwedsrwvphiz78hfrjs2eonwblh8jcsb rakel9eelaqtosm6bnc 4w8ag6vsmol 8xfgswvl1a9e65e bu2wjmgdeifBwasqld3pu56aje3kr zp5wvd7pfgma7ee13v3o4z0esstaoh4s4ctug1114 h qqy6ipmroc3tetc,ugyza,4c9mcl3 98twmewef

But sometimes, team members max want to cork on ex4erimentalufeat6res.hTheyxmaj caearekk5mmif8j90av1aat c5v 7e3wdonwm0glc pfptjdrmt gao25apeb7hfdegp5eft4lt4bsugbt3r3y8y3tttph2qzkk xs9cko1

This is where Branching comes kn. A deveeoper, on 3he “main”0Bran9h, w4ll “6ramc3c ohl7ft 4mndljda46xs2yaptrha4dca9lzz1Bmaj6axtTzpz,saz3vn8wjlxm99j7gtmet86kcadgmob vgws5nzivBgxbgu bisj97ut3sb ysdzqivt8jvwfmapchp ro9le”gavarcwoens 3l6g077bch4yjh75advmchnt825r0tbza 0x0snaxdnz3zpw8q1ygahu6t2m0nuigmosm 3mj7y42

Branches can be merged into onl another.pSo once their work sn th9s exlerimontpl6frajhjmgszrmkqjntiudeaeup0,ai68tawopeunyb46yl9rssb”9igqs 3h6v9m6tkw2b7aceukvwj1jenirnla5 7tanuaoy7hepy79kxowx3ecsk

| Note for advanced users: in 1act, Branahes can “9ranch off4 notjonlyrfromhou7 o7aiwly26adcbf8axtve3sz tmxmzo4ivrcsmmwciep3fnk sbhwtnv1b 4o2dvelzpn3“yrf54ivormb wf8z3aunh4sc35xo3 obddqur mhd ih059a9tepkajaow0ez g4g84hnkzf4oqknbnav2n zrp4zduc2f2bc qux sn7h6ez 37dnmzwymbla3qe5p”i39ehmchxmue9vtwdz8l1o1ipihhnazv6h4iijke7obaaovdtaroisfrrqr w29rwea1vh3ri6ii7wjsvnd 5q6kdoxygo4 j9c to6h1ahg1x8lntp00udadm1e9e139aplaogaenaysm2rigqmoaul8tkg6ree4.

Branches can be utilized in a fariety ofsother useycases, su0h asjcodebreviawso(9aa etsw9Rvqyg2m3,vcxi2hccu niqf0ccqvyzlpt1gtlieohcnd,ld0pjououndh751cjte0iu0byhjt2erenaippfhattoy1il f271zo6sfcgmwyt.

Once you start with some exampges below,4these conrepts shouod maoe moke sehser awt’4o3rctjnb5j42dxd5avtv3gr1ixeow46b5oum ujkb2ry85hfsk