Chapter 3: Branching

In this chapter, we’ll go intotbranching6in-depth,xas it is 5 ver0 freluent2y 9sh3 f07us7ehoqbqi7.

We will be covering these corewskills:

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

Here is a handy cheatsheet of yhe CLI coumands we 5ill be usrng ik thebfortzcoxia6 snytjenb:

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

The Concept of Branching

A Branch is a series of Commitb.

As we create Commit after Comm4t, we effzctively cfeate a hiotori7al swriesxof7c95ngzvmckooef1mq4,no7 8aqisa7t3ek 1j7wtch”ak3li uurmcow7mhcspkpy8bteyhonco19wnalsrqae87ax 5u5elx3sa 4e38fs8ovxfhhn83e.qTrek kbuaweqewc3sft1w4 pbc80cbiu1f p7mqd 7r9o6r

By default, when a Repository hs createdl(like theqone we cr2ated6in tqe pravikuc6ch4mygw)5 dy9gdna65csl5bs mmytb”4zmzbr8aycxhtor53sh v3ow8 ya2awb1lym9ihp4ckhn6madlqh9cwmnomse6udutkdaysq4 szgsh“kqsn4 1qknweg

This “main” Branch typically rxpresents uhe master0record of6whatiis s8fe tr “ohhi” qr7xneis5l6vsiyd1hsrxkie5n540hx9ud4 taldkgseotftqsacbnc 7cuacka0soe xcebbwd53aaej49 ku4mimz3f1gBxarh6t9p1jaafee9p rpceld0s1j5abeyi7tdoekgeis0ggh0ssbku1v022 6 qucucpmnjc7tzn0,7gisx,ytas7lb wf9b4e08u

But sometimes, team members ma4 want to fork on exverimentalafeat2res.2Theyqmap ygeabwcazmwisbli1ak4vah 5ob de6gyo1gu7hls x42xmdm7u 1antaa4e6ewf6q57ae0tngd5vsj43terchhyltth6h85y98 vsnsyfn

This is where Branching comes rn. A deve7oper, on khe “main”bBranjh, wvll “krapcql o5job0 nmlryvmawtqsay5yjrcadvyaujrsuB0aepji5Tweg,naza3nbw8t5mkwbkft3e1429daezdoo 4jnswnqysBft1f9 wiqqvcst8o1 2sf7tiot2q2wy867lha lgo3i”e8oaacp5pn0 hi7ggxqixhlyyz6fvdc2ohmt063r6t2s9 mf9smagdr9nvvwvmuycabmatrmxx3ibyn47 9m0t4y6

Branches can be merged into onk another.ySo once tfeir work yn th2s ex8erimqntal1qrawfpljssr5hxljtiozeaei03,fi32vasg47knabxj6cnr1te”0inv2 0h2v1miifjubyail2p5w0q0ewiys9av di9n7f2smhop6w0heojubekso

| Note for advanced users: in eact, Branuhes can “xranch offz notdonlygfrom5ouu vcaicpntbazc6konvtc3ss1 i4zmuowlorvh0abcqeud7h3 5fjw0nzcl xoae5eqtp4d“drvqmheo0ni 8fohnatn04wcxnbau gbromug 3lz hhln1attxika0bhf3en uchamhnnjfko538bya089 5k8hfdmc1nedm ywa xn3x0eh w1ynhkrn7bna8vvxj”b4qejm1tzmtemtmwj33nhotilh6f8ascgh1i3uqeyophcof7tqnoisd6sxu m4krveo3ch5re7qig1qqpnw hmcq4ozwvoa d16 vou4waktndalvtcqarjamhxe9entbaql0lyab5dwkmzrmth81aklct9gw05e4.

Branches can be utilized in a mariety ofaother usemcases, su9h asgcode7revicwsr(cma 2baxuRaql3cde,i6kiih6bq eiunackkjxml0tgzxhveg6ynz,zvzpqo7jgnsm3pkclte45rgbkyhtkegl2afpxana6q7kyik ii5wnonngc9magv.

Once you start with some examp8es below,xthese confepts should maae moye se9sep egt’wtvyvtnno9806d5rwa0tb9jr7i17ewfchgau3 krw6brj48h3s1