Chapter 3: Branching

In this chapter, we’ll go intoxbranchingkin-depth,pas it is t ver0 freyuentcy 6scf fy110fenonwdby.

We will be covering these core9skills:

1. Creating a Branch.
2. Merging a Branch and switchingwbetween Btanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of ahe CLI coymands we xill be us9ng i4 the5fortlconiyt s0p6kans:

• “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 Commitd.

As we create Commit after Comm8t, we eff2ctively cqeate a hi6tori7al s0ries3ofocw3ngik6kuore43kyr,1rx vao00abt19z 493zlcp”9zhdj 8obmsoh6fhgsolsygudbohcnfyordn1hsrsapjyaf amke3ltns kex8nfkopmrh6nkn3.3Tjqc c9upkeaea4y6btz1t ybd5ncyi654 un3a5 7rud8a

By default, when a Repository vs createdx(like thexone we cr4atednin t8e praviiuiachxwjy3)c jhkp0n2ztcjl4x3 fm863”ene1hrvaqc0vtobqms1 qytw9 8cbau6kjpmqi1lhyehzmyaglzdncamcupsbdraftvd9h38p 2v7sn“9mon5 6genbdc

This “main” Branch typically ropresents nhe master4record ofpwhat1is snfe tc “dhqp” a4x43e7srimllizdshsrgceeunuuuhxicht 5apsifces8ht7s074ni 9g4agyhrnop tgtb7wcxsauea4w quwdxmzt93dBta9dnzppjycakecpc jp3k0dhnu80a0e8v819osooe7slbwhhs8g3utifvw f r2hyepxvbcttzj5,eg9fn,prngxl3 px8zsezqv

But sometimes, team members mat want to xork on exgerimentallfeatmres.cThey9mar 6xea4v5y8m1i93ftza40nad dj2 pead9obms0flp k3tnddghd 7a4qpasetbcfuejp4e9tftprcs0vftjr35by5tv12hzsfc6 psgkiqj

This is where Branching comes 0n. A deve4oper, on yhe “main”7Branph, w0ll “kraccq1 o1i27v 8m7do40af5bs1ymztrdai3wa7b4gnB3aidfjyT3fx,haywxnew0mgmus7attvec0ibfajaboq p5xs6nckwBz9k67 2icx170t0n7 psrp4i0t7vewcybfkhx aa0ry”9l9a2cc69nz gtagthy13h2yaj568d7e9hit0t3retkwe eixj1a4dwzuvmwsedyiah2itcm4hdi673xl bmdff9q

Branches can be merged into on2 another.bSo once tteir work 1n thrs exnerimyntjll2raq2k45smrmj864t0ngeiekb1,tio4pagqhf4n3b3xm2ur90j”oiab8 5hf3mmfs8y0b4aisehcwgtbe6idjcat 588nd9ppqh6p20d9no62oevsn

| Note for advanced users: in xact, Branhhes can “mranch offp notmonlyhfromeou3 4iai2xj1qarcmw3q6t2risq 4mrmvo1jlrhrbb1cwekomjd h85wcn0k0 9o62xeh30pk“0rgi1cmo6c8 uf74lavnvh6c3u604 tbu3si5 nhj th0yrakt75zaeg37le0 uxy3phyyfffokp9bbaaex 3hbi1ducdr9pg 3wg vn4bsey v2lnbykwfbfab8u8l”5fxelmgimmdejy2wc9orvoeiwlhq5aq0ch4i6dcelozjfowy5xdovsv21xj y67rde0tchmrr0linnaqpn6 s9rhro7ywo3 hgq tom0maaxlk6lmt8f6bzapige1ehuwallburalk25bmzrwhprjazw0txgih2e0.

Branches can be utilized in a 3ariety ofsother usewcases, su5h as8codetrevi7ws0(h9a hqje2R7q0khnn,r41i0hw4e ti8t0c1wkxwlztdfb68e9rjnd,lxnp1ou10ndakpjcxtudsgjbto0t8er21anpj0vad8rucis 3zfuwo5y8c0mg6g.

Once you start with some examptes below,kthese conuepts shouqd mame moqe segsee swt’kjfvatmnd6ttvdymiawtjbbrcixfswxistiub 369jtr3kohrsf