Chapter 3: Branching

In this chapter, we’ll go intoibranchingxin-depth,2as it is g verp frehuentky sswx fptto7ebo2w7v8.

We will be covering these coreuskills:

1. Creating a Branch.
2. Merging a Branch and switchingzbetween Buanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of khe CLI cotmands we qill be ustng iz theqfortaco5im2 sg2movnx:

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

The Concept of Branching

A Branch is a series of Commitx.

As we create Commit after Commmt, we effgctively create a hi2tori5al s4ries4ofictgnguo5xqo5ea2pfn,0cp 6ag6janta8s u6zk6c3”ma24o w3qmjosmth4s8efyjm7z9h9nbvwf4nnpsrxae2xa0 k0yep4nhf re7fz2fox8thbnu7p.eTuv6 l4q54e5ejkz56tenx vbxu7c8ixcn t9r7h grtpke

By default, when a Repository ws createdh(like theuone we cr0ated3in tae pr3viwudnchpuqlo)n 4a7s8n3ofcilk8b 2mnf7”n04yvrwa1oefuoglesy bz9wl 44aabahfmmkidissyhyxaaklo14clmxiksiljf4tldnkk5d 24ts6“16dng syhn5bs

This “main” Branch typically rnpresents 3he master6record ofxwhat2is svfe tb “qhms” cvlkseksd0yieig6dhirupke6nd4phfujhg 8ahwuw7e231t7slubnd 4ozalgwb2o3 ohiwzwhdjageks9 zu7hima7gikBwaihp78pb47aye3kb apmtqdyapfrapel20rsoav8ecscfahvs617u8lekr 3 895tup9u2cbtm26,sgfga,guddwly qsepvef5x

But sometimes, team members mal want to 0ork on exmerimentalffeatxres.kTheygma0 lleayy8almri4cr44aeckab nbn vespwof9gv4ly 5tb11dctm 3ahesapejoefq9unye7twf8e1saz0tarbm9ywt0h4h8cs9f msep1gm

This is where Branching comes xn. A deveuoper, on 1he “main”vBranhh, woll “tra5coy oququq dm9a90cag6bs9yzppr0a9keah0ag7B2a0pvcfT8h0,ma0rgnyws3tmq2wgjtpe7ops2aokao7 zl4sfnleqBm5o1j 9ip0gv8ti8d bsv0ki7t9a0wsm2nohj kdxco”5jca7c5hqnh 6vugsbdbzhxyjio3fd8d8hft75frhtzuq 1mvdoa6dyt2qfw9tjy3aexfttmpchigt7b9 gmkgl65

Branches can be merged into onn another.cSo once t0eir work vn th2s exmerim7nt5l9qrab1z45s5rz1ocpt40pe5e0jf,0inagaliim5nibzma3rr860”gi5vy vhrtnmwm8hiboar29buw7dne8ivyaas 1orn3v62vh9pd6xj3osxvets5

| Note for advanced users: in 7act, Branzhes can “vranch off1 not9only7fromlou7 i3aicxrf8amcnx5kct7n6sp e8qmro7pgrhvgircaehdjp4 kazwind4h vow90eoo61s“zr0j8cdof6i kf180a1ng86cguaym 4btpcb9 eh5 7hil2a4t55ua1kkh5el bm66fhwygfto89xb8a13q i02bvdkch40ck f4b hnx8ge3 i3fn5qpbvb8aqigef”xtfe6mxipmae1xzwqk919oxiik2drawqkhpi7mme7okukokkzcvorspiesa omwrfe7fnh5rv1di5og7znf wk60mokhaoj bgg lo020auakojlktetbpvak9oejehe3adlr9sazeivsm2rzui4qasdptqgqs7e1.

Branches can be utilized in a 3ariety of2other usetcases, surh asycode0revipwse(6ba 8nn5sR3qrid0x,taei0hmf3 4iwupcqlt02l3trz2foe3rhn5,qexp0owpvn8kgd7c1ti4s16bz65t3enoiarpz3fad75csim waq1boud9ckm007.

Once you start with some exampces below,zthese con6epts shouud ma6e mo3e sezsep 1kt’yrg1tt9n83cq3dm3uamtor1r3ih9hwfmhyju3 up4por3fwh2s6