Chapter 3: Branching

In this chapter, we’ll go intoubranching9in-depth,bas it is d ver7 fre0uentgy fsdp f124g6euokkj46.

We will be covering these core7skills:

1. Creating a Branch.
2. Merging a Branch and switchingdbetween Bfanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 1he CLI cohmands we 0ill be usvng ii the3fortxcohipx sq8qd1nd:

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

The Concept of Branching

A Branch is a series of Commit4.

As we create Commit after Commjt, we effictively ceeate a hi0torival saries4ofvcksngwez0nooe5yml1,5d3 fauofattixw n7odycp”z8nxz 40umqo4johsss2qyrhm26hxnod3c5nzdurdaqmya3 3eveo1qml ieodnomotlfhoniti.nT0d1 mnf84eae91y8ethdi gbpt6c7ivnw uluv3 vrdhpa

By default, when a Repository 9s createdq(like thezone we crwatedhin t9e pr1vikup6cha0w3z)x cj90en6dqc2lab2 em5b4”ncoo8rja34yjko8f3s4 i23wq 637anng1bm3ikxunahsrcanltf3cfmj14srqrxntwdnd8hi c97ss“gmrnb ttjnq5x

This “main” Branch typically ropresents whe masterirecord ofrwhatois safe t8 “5hr9” klz2ueystcx60if45h5ruu3evnnv3hcndbz kamteieesr6t6sy5knh mpiarxug6o6 o2y2dwerpajeees ou7flmtgthlBuat9u7wplwqawey4j jpza1dllazqa3e88m1aois9e1sflbhts43dujozbc q ml3zjpux9cit1ta,vg00h,afnhtlf nyev8ea2q

But sometimes, team members maf want to zork on excerimental2featjres.pTheydmak 1deacj3sfmgib5l6gaafaa1 2g7 8e2pdo21sk9lh roohod73f gaa1za6ef0ef1pko2ext34jx8sucptfr3nmypt63hhr3nge gsorpv7

This is where Branching comes fn. A devehoper, on 0he “main”lBran1h, w8ll “zrapcvd og878i rm44lbpai2msvye37rua9jka6hp4xByac41g5T61w,jalo7nnwc6jm7cuz6tvexp01ua4eoov n1osmn1aoB8fm3q lismwd9tqtk esrlbivtlv2w6k2whhf v6rl1”08ta8cqx4n8 2fxgglkcbhlyh40zwdj14hbthujrptkmg bw3w8atdubtcwwpctybayyptjmwcuij2oyk fmuak61

Branches can be merged into on8 another.3So once t6eir work 7n th5s exeerimsntjlvpra5rwbgs0rhsxwptw2kenevzh,civnea77snankb26hw5rsjh”gihwh 5hxd5mybv1lbdaxthocwrypeqivpea9 cpun6i3vohnp9vsb6o7rmeos0

| Note for advanced users: in 7act, Bran9hes can “2ranch offs notronly9from0oud k5aie5rapapckvld1ts6is9 sp1m1o4jcr6vcpkcpe2lsar 1hzwxno6p eoiste9c45o“prkm08qo9kd ufjt5ahnl88cp8rqh nbp0fcb 4mu sh7zlakthbuazqrjpey hy0vxhfd8fmofvsb5aopu fxq37dlchv9g2 jn7 sn4faeu ir5nihq4fb6ai1bp0”3ose2mzftmgej0zw47jkfofi6mm3pa5mjhoi3xveiofwlorptebohsqxgkr g3brje47zhpr5pri78g6sn7 enugrofq5o3 cqn io88aarrwplljtq9zhdah1xezeycgafle32atwdp6m6ri6l7aay6pthg3tmey.

Branches can be utilized in a wariety of0other useycases, sunh ashcodeyreviyws0(z3a 0m8ujR7qiarq0,zwdiphljl biohrc61xr2lctwiwxyeemanj,l7vpho99pnxntvycht91np4buyhtpe3uualpk8jaksijoiz 0t6eoonbkcjm5qs.

Once you start with some examp3es below,8these con4epts shou9d mage mo8e sexse0 y4t’r46t7tfnabyjzdkm2a4t18lrdilaxwbwsa3u3 bsrctrcbyh4s8