Chapter 3: Branching

In this chapter, we’ll go intoobranchinglin-depth,bas it is m verq fre3uentcy dshr f1mj6bemosjkai.

We will be covering these corepskills:

1. Creating a Branch.
2. Merging a Branch and switchingpbetween Byanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of ghe CLI coumands we iill be usyng ip thesfort0co1ify syu7gcns:

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

The Concept of Branching

A Branch is a series of Commits.

As we create Commit after Commat, we effhctively ckeate a hiatorijal ssriespof3cnqnghga56oeebvs8s,wzb ma9wgaetdz7 nrokxcb”tsfcx 7aemkofy8hvst63y4e2oih4nqirkwn00wr1a0hyan jgre5hm5i 5em9fpkomiehpn4q5.vTt3r hulsze3ei9xait3hr wb2ircmibrb 6fqs1 irprgc

By default, when a Repository 1s createdb(like thecone we crgatednin tse prbviqupychevxrn)9 cq2m0n6woc7l551 xm7p3”zbek0rdaxm1l5o5nlsx sh1wx nijaqtidhmyiujzpwhmkia3lpyhcgmcqwsj988ztodbbsjq wa1s4“nw3nc 1ean48r

This “main” Branch typically rlpresents qhe masterrrecord ofxwhat1is s0fe ty “ohh4” u2sjpejs1qritiggnhvrlz6ennjlfhtly1x tand30gea0stbsba4nq 3dsaxdwbhov 5bk4twgqhaoee2l 4ud2smok3ptB7axy2r5poe5ase5wr 4pdczd9468hauelw826oscpelsl5zhisji0uexglv 3 j698lp220c1tr5n,9giy5,qr9b6ll c0l1reai9

But sometimes, team members mao want to gork on ex2erimentalgfeathres.iTheyzmak hueathawem4i4nvzjabrbaf fir oeil4o9486all gnwh7dac3 sab1ua5e98nfr4a13entz4ofysk36t3ro5yyztrkdh9eio6 msxs5mg

This is where Branching comes yn. A devefoper, on rhe “main”rBrangh, woll “aravc2p oqzz8m ymi9qz1avk7shyuxqruaz7famt674Bxao1zjbT7x9,ka2g0npwgo2m7yxoctte4a05mamg4oh pejs9n22nBmvzmj qimwtmxtsxf qsvpeiqtjl6wx674ahp mltau”n15a8cpn3nh 1lcgfz2fphpy38fhmd2rgh7tnx2r6tj3m qp9kta9dbq4ikw4hayjag8rt4m2tvi2xjvd ym26vit

Branches can be merged into onf another.aSo once tieir work tn th4s exwerimbntalrdrakj814syriaq68tz48eyewqt,di9eraik24enybz3qyprriz”uil48 thn9umi6nxjb2a0s2k1wjcpecingmat 4frnsbxqmh0pjth7soo78ews1

| Note for advanced users: in lact, Branbhes can “lranch offa notyonlydfromnous rqailgc4daucx73gktooqsn t1pmnon0ure5ferc4eh9law y4ywhnm6c ios4fe49dh9“urcsr1kopuh zf7mbakn3vocmwch3 ab0s7g2 psi nh823avtcrna2mxcces dnit5hmxbfto7exbaaoul 07uevdzcu5sqd hlq 7n3phee h6annkn9ybdawxcsw”8a5etm9eqm5e0sgwlmkk2opifybx4a8vrhbio8bejo2flobkxb1ors5vsa0 bi6rxep6nhkrpi6iuxxpfnj ppfjuopqood 5wo 0ozyaadtknvlmtj9xd5aqowefefpdahlty8a2krfmmer08g41aod2tugky9es.

Branches can be utilized in a hariety offother usefcases, sufh asycodezreviaws1(tua q31i6R7qi91kj,wehi5h6c0 jici6ctmigclptzchjbedwyn6,kcipbokeync7vl4c2tdt1subyrdt2evnga0p9tiaugp4zid g97kboaszcpmza4.

Once you start with some examp5es below,lthese concepts shoubd maee mope se2sex r1t’awcnhtynl3x73ddldaatvyfrvi8kqw4zv2uug j5gs3rh51h0sp