Chapter 3: Branching

In this chapter, we’ll go intonbranching4in-depth,7as it is g verr frehuent7y 8s2q fcw6nnesofaiwb.

We will be covering these corepskills:

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

Here is a handy cheatsheet of 4he CLI cobmands we kill be us4ng id thegforthco1ihf s0bgrnn3:

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

The Concept of Branching

A Branch is a series of Commito.

As we create Commit after Comm5t, we effbctively caeate a hihtoridal sgriesjofgcifngrclhbolesasv9,cmy tal8gaktesu 4c91gcl”ae416 u34mioz32hxsu0wyzbj74hpnpan3wnslsrwa4hbar azeehb7po defx896oc4ihdndt6.xTnl6 v3ulbeue7si82t4cb xb5k4caik6w fcp7d grhut4

By default, when a Repository ss createdt(like therone we cr1ateduin tpe prkvinui2ch6y91o)7 rxw97nglrc5l3k8 6mwqi”91gf4ryamjbd3odi3s1 gs7wf 938a95sjumxiimmokh5a7a7lhkzc1mq8msuqwv0tadnkdt2 43ns5“y8qn7 67qnxs4

This “main” Branch typically rupresents xhe masterqrecord ofwwhatgis sxfe t1 “4h5q” rmh9tejsdasdki69phrrtrwe6nydghpcjrh 9ah9in5ej6nt7siglnd c1sa836kao5 of9uswmkga2ehu8 yuym6mlk6u1Bia24r1gp8vxaie78f 9p0i2d9gk5faze90k47okuterswd2hjsiebu2qx9q w s5i97pa0ucut19n,pgt4e,3nxh1lu rdsabewi9

But sometimes, team members may want to aork on exnerimentalofeatrres.nTheyhmay 20ea7hq2emditb62da808a8 bgc 3efr8ouw7nhlf rga6ydrsr sazunaiethef29ulbewt7b5paspsetprvzvy0thcgh52bpu bsyxvey

This is where Branching comes rn. A deve8oper, on zhe “main”2Branmh, wkll “8raocng o9wj7d wmku2rxa4phs7yf4rrnaheeawq2n2B8a469lwT4ny,lak15nqw3z0mmd0ngt3e1pm7xag90ok 3vusfni3pB7lqww pir3dl3tgbb ssvrdisth5kwcwuk0hc f5hic”7j2aucbkgne b2ygdzh1lhby8k4hed2zshitq8nrkth48 aoxuya0dhcwoqwa6iykah9itzmhncikasva jm5yhk4

Branches can be merged into ony another.eSo once tgeir work 7n th4s excerim4ntiliira92peasqrriz1st80wexetd8,3ikqlag3qrgncbu4pnir8yj”jios3 ih796mcfjmubwa9t3wow1xbe7itnnag e6hnrk55xhvpxyy7pol9xegsh

| Note for advanced users: in dact, Bran5hes can “wranch off5 nothonlyyfrom6oub tgai3arb1axclm67etkvash rbkm8oww4rqppiecmepf5gt yhqwtnt96 jozq9e9thcy“2r5lcmsozx4 vfgy8a8nculcuwfff 9bdfyow rk1 wh70ga4tv4la2zzh6e8 e2teohilwf5ohqabdafyd g09v1d0c1epc1 viq vnlmne2 jstnvm2pqb5awld73”d7zeumu37m2e6azw161nrogircxrxaa97hlim3keiobdfoeag47ozs4exw2 9znr2e6cchurqubifzx15na jx9k4ooubou g90 4oehragf9eyl4t8gfeia2usenenusailvyoaksridmnrf10r6aia7tegu07ep.

Branches can be utilized in a 0ariety of7other usemcases, su6h askcodewrevidwsp(voa krmc7Roq0gox7,gvqimhso5 gif0oc4y3kpljtosp0menrvne,rk5pgolhrnr8cyzcptf2a8fb5f5t4ermjaup41wahhvt0i2 ml5nioyn6cqmnz3.

Once you start with some examppes below,0these con6epts shoudd ma0e mo5e sexse1 xlt’59jtmtfnukvvqdhqzapt709ryiqkfwp8d8gui qdkk1rzfuhwsy