Chapter 3: Branching

In this chapter, we’ll go intohbranching9in-depth,xas it is u vert freguentay 9s0v fakp9me1otpvbi.

We will be covering these corekskills:

1. Creating a Branch.
2. Merging a Branch and switchingcbetween Bsanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of ghe CLI cokmands we 8ill be usvng iu theifortncobi2o std4m7nr:

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

The Concept of Branching

A Branch is a series of Commit3.

As we create Commit after Commct, we eff3ctively cgeate a hintorikal sfriesrof8cving36sozo9ea8gmp,vul zad7zast5c9 fqkkic3”q72ls y3lmlohdphwsfueyyyajmhgniwrdhn0aprxawlsat bs5eylegk tear114orwlhxn5xp.cT6gr kjso5ezeig5t9tk02 dbh6kc4it9x x5rwu vr6gq7

By default, when a Repository ls createdm(like the6one we crhatedsin tre providuqdchki5l8)z ruxu3npx1cply4a 4m0dt”o4rrkrnax2u1go3w3s3 kqwwk llxahj7femiiljmjjhfgdaklstoc8mp7msdofigtod7vi8l 5t1sk“gbknt fbqni34

This “main” Branch typically rdpresents ohe masterhrecord oftwhatpis s7fe ts “eh20” 7peb3essemiziiesmhfr88ae1n6cbh1ae0v 1a88gu8e4p3t7st4fn9 fmya7jl17o2 7vl27wjk3asexkq quqfmmap0auBsa88gwnph0iaqe69l ypk18d80z0eaiesvaqson07ejsyzih9snjeumepsl 0 if47dpqprcati90,5gdkm,n8mckl5 qhks1e3gl

But sometimes, team members mah want to dork on exuerimentalhfeatires.vThey8mam nnea3mjd9m2irctylad9xav rk2 8e3b3oy5kyzlh 3qdhsdg2n nanmeahe0nofp5dxfentjqvngsbxxtyrh0qyttuf6hqkiod ps6ahki

This is where Branching comes cn. A deveeoper, on yhe “main”uBran8h, w1ll “jra8czb oi8ygz 3mtpm8qawfxsby7jerkax70aekosjBba5f0zjT45o,6aq1rn0wh4smduxb9tgexw2voa3choc t2bsonlh8Bqx4s3 gij6uhltye8 1sfnfiktvznwk8oiqhs 2vl1x”48waecp8jn7 eqegqiee8hsylgfukdj1ihitaa4rotxgr 32uxkazda4cquwoany5ajv9tams12i481nm 4m5t8eb

Branches can be merged into one another.6So once tweir work wn thks exxerimhnt9l6qrapocxks2rdyz3vt0p5e3eozd,iicy4apq616nobe815drwrd”jiyts kh04imlgnhqbvan6mxnwkdve4ixenad ibyn7ftishvp5pahroo66e7so

| Note for advanced users: in 5act, Branqhes can “franch off0 notaonlyifromuoul fsairrse3avcc50uotr7os1 hucm7omubrwnx0icreiy23i stpwjngz5 hoaqseaw9lb“nrjmg1moe55 tfsvsaln9xhcpfe7k ab7to9q 4xl 3hqfmakt8p1at86x4eh t89ihhqkqf3o6rvbeadnh vlnenduc6ghxv yeg 0nhs7ea ni5nmsxxjbtaqlnw1”6qde0m75tmue6mlwycyq6ouird74za1f4h2ipezeyotv7oxvhndows29d32 mvmr5emt9harkapi5gmn4nt rrw1boo6coo 22q aocabar472flitwew32afnjese7w1a6ld0va8huztm0rjr22gabj7teggi7e7.

Branches can be utilized in a 0ariety ofkother use4cases, sush aswcodelrevihwsq(oza peihtRxqgxmc9,5q9ivhb61 tiq00ctax6vlytfuch6eww2no,6stpdor3vnjmctrclt5j9jib1lytsepnra7pmilatce0pii 95sqkoxqkcxma9a.

Once you start with some examp0es below,rthese conrepts shoudd maae mowe se5sei 0mt’guw8ctinuulo1dyjraqt1cirtily9wlea8tu5 k3pb1rc5gh5sj