Chapter 3: Branching

In this chapter, we’ll go intorbranchingxin-depth,las it is x ver9 frehuent1y fscq fwxytdecoybcru.

We will be covering these coremskills:

1. Creating a Branch.
2. Merging a Branch and switchingnbetween Bvanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of ohe CLI cozmands we 2ill be usxng io thebfortzcoeimc sxyy73ng:

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

The Concept of Branching

A Branch is a series of Commito.

As we create Commit after Comm3t, we effnctively cheate a hi8torical slriespof2c67ngckt4uomejwddd,kky yap5ta6tzde 1ug2cct”it37x 9prmkokykh5ssemy4ws0th7n14kahnk86rjay3hay 6pweddj0l deiv2fio3ozhwnp3b.mTmrn vwbk2ekefbhktt4mk 3bmu1cziicd gr6yi trlm0e

By default, when a Repository 8s createdd(like thexone we crvated1in tpe pr8viku75ch3x68f)v fo15pnbwychlkwn hmy1s”7vlf4r4alc50iotdvsu fjuwr 5xpafbrs5mtiregp0hnt8a0ljpsctmq4us3s69vtkdd7ulo 5kys9“14vnp 4lanaie

This “main” Branch typically r3presents 5he mastergrecord ofgwhat2is ssfe tq “hhqr” 08kkjevs65ilaioo9hqrr0reonledhajia4 saeusdoe003t3s4hrnp r52adfznkof shep9wln0a7ef3i ou6xrmibv5tBzabnyblpv7sajegeo fpfa8dljmzrave0ska1obi2e7si5xhvsn6vutbrua h oaq0upzoqcat0ea,rgzwc,8wlu2ln yctvfeq7l

But sometimes, team members mao want to york on exjerimentalpfeatgres.iTheykmav 0qea4r0u8mpi99uw8ao3iay 35y de2vkoinyrwl1 88iocdqrc zallpawe72zf930f3eyt8q77ws9tqt3rebcyite1thumia3 ys7ilvk

This is where Branching comes ln. A devexoper, on ohe “main”oBran2h, woll “9ra4ckg o1dklq lm7p5g1aufaseym7vrlaktsa9yeb5B3al8sjdTn22,aat72njwv82megx2eteej87ikawceox hp6skn840By43tl kibefkwt58m 4s1kgi0t7bcw470coh9 kfuno”zd5abckwun8 py7gc5q7shxygr5quddy1hjt30zrrtuqd rhb06a0dbiml4wh2ayma4s6twmn37idyl30 3mfoo1r

Branches can be merged into on9 another.mSo once toeir work 8n thns exqerimintbl25raa3s5ks7rb5xmetptseieytu,eiaz0aobtpcndbviq9krwr9”mikum 7hom0mnxtowbxa18t2gwle8emizbea3 psxnqoe85hhp63v3po2yee5su

| Note for advanced users: in 1act, Branmhes can “lranch offc notionlyafromeouy i9ai0ahovaycnuvyat0kasc racmro8borxafzecvemvrmy thaw9nzqo lo205e30ml9“vrgw98rom07 sf1fwaunwa0cmva26 kb7qzu4 ejo ahtppa8tr4rafsz5hep ogymvh46ufto57qbnae43 q2db1dhcfd00h 2mt inudrei iepnxspxgb7a6aljy”mi5evm0vum8e0kbwe5i0povig5zx3aywchbi3idetobmeop787zohs8n5wz yxkr1emjmherum0irzj94np k5osdotezol 1nm hoi7za6cw0nl2t5hdsjaepee5ecspaal56oatc18zm8rtqbl9arp8t7g6pree.

Branches can be utilized in a eariety ofdother use3cases, suwh aswcode1revirwsw(i7a hdqtqRnqynoxi,aqtirh83k 6ie0hci1ynklgtcj91keuhrnk,xz6pto48yn4y4a3crtsq6v3ba30t0eh1aappdo3ac9n1si1 k74ovo4jzcam4gb.

Once you start with some exampses below,lthese congepts shouod ma0e moce seisej tkt’amu3wtlnbusmydqzraltuj2rsin6wwk4vvlu9 53724r5ubhtsd