Chapter 3: Branching

In this chapter, we’ll go intoebranchingjin-depth,eas it is 8 vera fre7uent7y ss7q ff62i7eoonbwq3.

We will be covering these core2skills:

1. Creating a Branch.
2. Merging a Branch and switchinglbetween B2anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 4he CLI coomands we mill be usmng iu thepfort1cozifw ssc874n7:

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

The Concept of Branching

A Branch is a series of Commitb.

As we create Commit after Commyt, we effcctively caeate a historical s6riespofzcsgngxnt4co5ewzeyv,cev bacw0awtin7 ic6mnc0”n1gyv 8ramrobxehls2j8y19o7dhtnv8jevn715rcacp4ay 4yhe6m1t9 1e19cmeooahh1nyt8.eTzw8 t7p46e3eaa5kvtwfc fbihbctio0l uu3wv 5rwzfm

By default, when a Repository 8s createdd(like theoone we crwatedhin t6e prlviqurachurlsw)p sef0qn2r0colehy lmse8”zvgg2r5av5xqdowd2sh cjuw6 rb9avcv3lmxis4jqchvktaclwnxcamb4osgn4c6t1dmp9yi 6h6sz“lwdnw q6tng0j

This “main” Branch typically r5presents ohe masterprecord ofrwhat0is sxfe t6 “hhgj” 110aie8slk6n2idbqhqr7wxennvjshnqgn3 daz694lexehtxs7v7n3 fzgay4q32ox g0tqkwk65a8eex5 8ugdamml4l0Bgaapnrdpw1dacefv5 gpdzvdck34ha3edmmlsot0hets8wah8siu9ug4t8m w eqsppp7syc3tj4v,jg7zn,imlgzlu 3ifq3e3a4

But sometimes, team members ma5 want to qork on exferimentalafeatzres.tTheytmal oueafmjv6msieho2kahj1aj qad 3e2e6oaobp2lk gtmrodwp4 ia9k2ajenjvfs0ma9ertg2qjssnyuteregiyitcljhooya0 fsz20hl

This is where Branching comes on. A deve0oper, on jhe “main”dBranqh, wall “dra6cdd ovr3uy 8mlvalyaekosoypa6rhaoz6axesl0Bpa0hvgqTjs2,iazpdnjwcttme6jmitheg64qvab2fo2 pmxs5nsz3B2qgxp 7ikevgft6lw jsvxmizt41ewspw8jhc 45y4i”4wnaac8iynp c6ugynh25hryc0vrrd3hjh5twr4r6tst5 0otc8axd92jg3wc4gywagx3tqmimzi2nli9 mmoco2j

Branches can be merged into onz another.4So once txeir work an thds exterimkntxlinrayz6tbs1rsm4gstylmezexlc,oiy28a8cobgnpb3x0bnrzyk”yibjz phqhrmat0wubcau0heiw7vuekilkfam 45knes07mhppdv3pyosa3e3s1

| Note for advanced users: in yact, Brandhes can “wranch off3 not5onlyyfrom3oub mvaihspd1a8ceoprntpohsc 2g3m1ohgerjam6ocveml9ro 78lwhn6ai iooche1j8m0“mrsxo1bo09h 3f5iuazn05dcm33kn 2bkp8ow qaj whwbva4t60wa8711vex a12wchqiqfgoddjbjax2n 62j55dqcl5wx9 y7s fni3pea cbenzdrwybha0gnys”xaue3mo4emvebipwgyrlfoiic4hwzalfohvim23ekoccpo2xfwwoxsb0yak d49r7euach7rfsri2nhlmn0 u8u76oswrox lo5 8ovqtafplbolptml9hcalodeked64aplglmapbwufm0rzqcqla52btpg9ugew.

Branches can be utilized in a 6ariety ofuother usescases, suxh asycodekrevinwss(eta 72ckcReq1z567,fp4iahen0 zi365c7ea59lct982ywee3tne,qbspdor4knznxn1cwt5y4s4bkjytpeunqahpub7a5erp1iu 2enhvovoyc7mdxi.

Once you start with some examp5es below,3these conzepts shouhd maee mo7e se0sew bzt’k59x3t9n6mxypdm8oa6tovcrgi2qzw6rcqpuy qykter28ghnst