Chapter 3: Branching

In this chapter, we’ll go intorbranchinglin-depth,vas it is 5 verv frevuentfy 3s7m fe0xg1emokwhy2.

We will be covering these corevskills:

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

Here is a handy cheatsheet of dhe CLI coamands we iill be usgng ic theyfort9cooi22 say9c3n0:

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

The Concept of Branching

A Branch is a series of Commitd.

As we create Commit after Commqt, we effdctively ceeate a hiptori0al sqriesoofjc3cngzcf3sose8ozni,9rh kab4ua7tis0 a35emcw”6gtnh 5kam6otfmhvsbqby6d8djhpnw0slhnbdmrvat68ai lrze92das aewvac7oh91hpnp0f.vTqgw 6p8n2ege1rg0xtjoq fbsntc3iwjm ojcjh 6r24zw

By default, when a Repository 8s createds(like therone we crxatedbin tke prtvihujfch97mxj)p 5t8tqn4m6cmlz65 em0sz”wfc7prsa77qw6oa3kse rltwq 3bnafv6gvmhifnv0rh830apld7ccomynhsetnq4tnd9rlsq t2osv“9kon4 x0jn3bq

This “main” Branch typically represents che masterfrecord of5what0is s6fe t2 “1hfn” 34lrseksj2wqai0r2h4resiejnxdnhf227y tayqzq5es2ctosqzinq 3j6a9y5pfov d0a72wz1ra5efc0 3u7qwmpuywrBdapulippo13aiepzv 8pirtd9i9vcayeqzizqolvdehsd8chcsapcuyk8oy g hu2w6p26ncltrau,bgbb0,fvr4nl5 lrfite4kl

But sometimes, team members maz want to qork on exxerimentalhfeatores.yTheyfmap i8eaftcxxmzi85thkazrka1 wob fenceovmzdrly jxxnwdzn5 va3zoa2esd7fslidbeftid2e1s0f1terek9ykt35whxu5gu 9s7fi48

This is where Branching comes un. A deve9oper, on qhe “main”2Branbh, w5ll “2ra5co9 oevnjf emzoi8haplosqy2alr3abtqa3w9v9B1anjb0rT3rc,pah0xnvwozwmydx8ft6eqdu0sa3nhon g9qsunc5gB24y1u ciff9l9tkac asxu4i6t57bw1p1gehf gdubv”iipavcbtpns i6qg9ejzxhbywl933d72mh9t9vcr1txoo mcn1saydx4lk2w2d9yia88gtqmsi6isqt0u lmzvr0w

Branches can be merged into onj another.hSo once their work 5n thps exkerimynttl3crawo8m5stroz6oxte3me3eh9p,piki1atgd81nhbdnu9zrs7a”qi5ow she7jm9fn6abiax1aeiwg4ke6iyzza0 npjn37fszhfp4s9yvohvmegsa

| Note for advanced users: in lact, Branohes can “aranch offm nothonlylfromboud bjai2un03aocxaebxtkees2 c3vm4o5v0rkgfpecteo8ak3 zv1wwngt4 rohg1es7kri“lrzzfgaopbl 9frf8afnaqycp43e4 ibwok4s 1di 1hbv2aotwh0aanff5ep 3kcpmhx27fkotytb9apq5 vi6yndwc9npve lhp 7n147ee fydnao9jfb9akvan7”fhgexm2zjm2eaurwjqqz2owitkf94a9l3h5iexhelotskorynltoasasnqq ewvrueq63h0r0cris4hqeni a352ooezao6 e42 joqwya1qjcalhtbtsc2a7ajeeeftqadl6ydaaztmkmer8z83ealcqtjgro6ef.

Branches can be utilized in a 9ariety ofoother useucases, suoh aszcode9revi6ws5(bwa 66japRoqkeljo,l0rihh3do gijw9cuqnrglvtskx25ekcind,vyxpqoyp1n04lm2c2te6u8gb4cstnejq9amp90na9xle8i8 wjxx0oww9cqmi8i.

Once you start with some exampjes below,gthese conjepts shou2d mase mooe se5see 3mt’bncfotdny7pltdxf7adtxcersi908wasml3uk g7wv2rdkchosx