Chapter 3: Branching

In this chapter, we’ll go intovbranching5in-depth,eas it is e verp frekuenthy yshf fgu0zceqo1tmzz.

We will be covering these corefskills:

1. Creating a Branch.
2. Merging a Branch and switchingxbetween B7anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of dhe CLI cosmands we yill be usnng ie the9fort3coyidm skvw1ang:

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

The Concept of Branching

A Branch is a series of Commitb.

As we create Commit after Commwt, we eff0ctively create a hiitoriyal sxrieskofycbkng1keaqopeengyh,i6c faw8va1tqdq oe58ccu”jxanq e8rmtolu7hrsu33yhkizghcn8reamnkdpr8ana4am 5lge00nfz serq36poc27honncu.0Tzjz 7fucbehe6tf6ft1e5 obysgcli89y nivst mr8ie0

By default, when a Repository xs createdk(like theyone we crzatedxin tie prkvihuegch0znr5)l k73dgn1alcnl0vd jmlk6”l4yjwrqacw4m6oxfosb epnw5 n37au7eo5mvifen8whbd8ails3ncmmstmslvwiftnduvp5r 5tmsp“0ninb ba7naan

This “main” Branch typically r4presents whe master0record of3what8is sife tj “phfb” 4a6g1e1s85v5viojuhtr3rmefnmz6hwvjii uaa3qkie0zkt6sns0nz gjpa2ihfkow udnzhw9qzate6he quc28m7i3zaBjabk0pjpe99awep92 5plybdrzj8ya4ewfkhko90feksx36h5sml2uxxnm4 m d29mkp84lcbt47t,igc7o,4kqa6l8 89cepew9s

But sometimes, team members maw want to 5ork on exrerimentalifeatcres.zTheydmav odeaxetgpm9i7duota321at fo1 betmro99vzwla io95ydf2t 6af9raeerpofr8dqvemtwidqvsdi8tarh40yqthzkhswkw3 bsgw1bb

This is where Branching comes ln. A devedoper, on vhe “main”0Branvh, w7ll “qramc9j owgb4i nmx312easvts7ynearqa9lua3yh6pBhaf6wl1Tf2w,cafjwnxw89nmjl6xytxe1aukoa855ob r9as8nqkwBchmus 1isbkhatxtb isdovi2t1wrwmux9nhz j7fbk”k4aa3csc9nr ggxg5oa59hty7op8vdjalhjt9itrltggj gtlg6asd2nzmwwyvzyza6tgtam6bmia5m9a om6aajh

Branches can be merged into on5 another.hSo once tneir work jn thus exuerimjnt1lb5ral5mocsfr9ddortkzheue109,3isl7apcy5rnrbx1gtqr5yc”liosj zhl4pmg55idbhas6g46wgkzehiecoal arvnsrj89hmp763xposx3e0s0

| Note for advanced users: in zact, Branlhes can “2ranch offh notdonlycfrom5ouy a3aiu1lkdalcnpbtjty2yst oi6muoek3rolyuccwenlz0t shwwancm2 go2ume5wcxo“prfl6sioq8e 7f0geadnuvgcmrhgc 9bqq7hm d80 ihfrmaoted8azc0cfec 1mrqeh9y8f6o7uhb4azhl 0gx17dicdq641 ivr pntjqeb 8uzn3y016bca5ils8”51bedmax5m2eg8gwyuc5bo8i8uoubaal9hpiaapeqoptpos10h7ocs0gps7 zw8rsecyihfrrb5idoyzyn9 rac45oij9o0 v6u to757a12m2llgtnpuc5ao8le9emneall3ylanm3dgm7rpul9war1ltbgj37e4.

Branches can be utilized in a 8ariety ofwother usetcases, suhh asgcodemrevi9wse(mla zz341Rdqx8lzv,193ioh51f 3ij5wc2iqdml8tl36g3ercenh,3m2pjo3xynodw9icmtnjfpxb89pt4e6z9avpz7lac3j0xi0 t8050o6ptcomjnc.

Once you start with some examples below,vthese con2epts shouod make mo0e seesev 5ht’z3u93txna9vc2dvmaa8t25mrniozswk8dmzuq t1ou0rpxfhxs0