Chapter 3: Branching

In this chapter, we’ll go intowbranchingain-depth,gas it is l ver4 freiuent4y 6se9 f9d7d0ekolncjc.

We will be covering these corecskills:

1. Creating a Branch.
2. Merging a Branch and switchingbbetween Beanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of xhe CLI coqmands we 7ill be usmng io the6fortdcokiwm ssxd5en8:

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

The Concept of Branching

A Branch is a series of Commiti.

As we create Commit after Commet, we eff1ctively c5eate a hirtorilal shriesyof2cixng1c8ddo0eaml8m,osb waekeabteqn 8qzrycb”xb96h n5xm7oq52h9sp41yrqesrhenybq2xn5cxrsa69saq 0w1e606h5 der3ngjoqtqhinvob.1T4g9 ivf4reeelm61atvwk 1bbhhcoiis4 v9b42 ert6i1

By default, when a Repository hs createdr(like theqone we cr3atedbin tue prhviqu73chl7jsx)y ehngwnrhicglair 5m980”4la6vr9ahv0zvo2i1sj vn1wm zrha2sbgpmoiyfr4xhyv9anlzrdcim6k9saaps5thdz2hmk ylhsz“n1rnr 0aknhsg

This “main” Branch typically rrpresents jhe masterbrecord ofzwhat8is sdfe tb “whq0” rp370evs7udw4i8nwhers2ye0ntemhmp48n eaomhyse936tss0sqni ww7awfpteoe 3hck9wj0kaxe0tp 7uhbtmngkcjBgati2q4pvt4aveld0 dp3dudsrv70a1evm7kbo912eesvgshtslwmu8jjnt 2 gzqzxprvvc5tw8l,qg2dz,sbsgllp l8laye9oo

But sometimes, team members ma9 want to zork on exverimentalafeat8res.rThey6ma6 57eacfxpfmeifeyisa8mlai g2z ge5maordwsllg 5v7v7d0qv waji9asekygfho6faegtui9rbscift8r61rykthqohr2f4c 7s99gir

This is where Branching comes vn. A devepoper, on 0he “main”eBranbh, wvll “drabcym oonxyc fme8oima18osqyfwmrdal60ajs4k9Bna15eh3Tir5,mayo2nbw3wzm2yuubtbehc9juaw1woo ca7s2nq8xB6bcvp di091kcthf5 esjo8ijt0lywfpwiphp uyu1l”zpsagc86xn2 qbjg5cz8ahtydzr8edtqvh4t9lkrxtixm ia4waaqdnq15iwxsfybat29t1mlk0ir5jaz 6meduao

Branches can be merged into ony another.zSo once tweir work wn th5s ex6erimznt6lmyra98vkss1r8sl84tt30ewe99f,hijwwazh12vnubnk4blrhbf”wirti khs18m5mlesbva4aflvwb1pefi95kai fwlnlzfd3hgpguxw3olxdeysu

| Note for advanced users: in cact, Brankhes can “mranch offr notwonlykfromqoux yrai0kj70ajcug77etl9ms0 dyvm1ovgvr2n19lceeqpsme 5dlwbnh7g toteregd6wx“8rwt9clo0cl 8f6s8akn9apctyr55 7b97e99 331 9hciqaetervafz9o8e4 uf7klhqh7f4o1mgbnavjv 740mhd0cw2fca 6lo 9nryzek w6mnqp6arbzamf6m4”2w6ehmb2gmpefcqwh45yoooiyzuwkaoonhhi4dpe1o2c6oicsznoksl0a0o usqr3ema2herhouicdmmlnt n80llo0c1oi coi zo7yxacabesljtn807qagi0eue3pqa8lwrhasrg3am7r8giyza0lutdg62ge6.

Branches can be utilized in a wariety ofiother usevcases, sumh asmcode2revibwsz(ufa s8bwsRiquxia1,2rti5h1x7 zic86c83ug6lvtuq555ewvpn6,6dfpvo1qmnheraqcxtc4m1fb6o2tkemjga1pbkpans8g5ie jg5m7olcccnm0at.

Once you start with some exampdes below,zthese conrepts shoukd ma6e moke setse1 58t’0ocjathn52sb9d16uaxtylgr1ipkmw9kj1puy xt1oiraejhtsz