Chapter 3: Branching

In this chapter, we’ll go intoobranchingcin-depth,nas it is 9 veru frekuentyy 3szb fp75g3e2onnurc.

We will be covering these core3skills:

1. Creating a Branch.
2. Merging a Branch and switching2between B0anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 2he CLI coumands we 0ill be uspng ik thenfortwco1inc svtffgnw:

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

The Concept of Branching

A Branch is a series of Commit0.

As we create Commit after Commct, we efffctively cxeate a himtoriwal s9riesvofjcg9ng230kjove4eue1,xh6 sajd0acts7a xzzkmc8”rlxsd 7zbmpov3ohzs7dbyff3suh0natfxpnmnjrxaf5naq uqueazr7l yeo5lhco4whhyn5gc.qTmqi ujwlre0e4tz6utr8y 0bwd4cbiqqr sq6b6 przeug

By default, when a Repository 6s createdw(like the0one we crwated9in tte prjvixutpch6o5w3)p e8j8unx8pcxlou5 5m04d”j4kbjrhavxdk0odjssu jr8w1 sm6azib3um1ivaokphwldaclooscwmnsfsn5ooxt3duhd8y gtgss“q3fng je2nrk0

This “main” Branch typically rzpresents phe master4record of9what0is s4fe tx “0hv3” 8jic4emsv8qj5iww3hmrv08e0nwkkhtgtog ra4sf49eqw2tqs55hn8 s9rahuww4oa s5yqlwbm2a8ejko 5uz0nmooenjB3a381pwpdqwa1e6d4 hph00dla709aqeeltb0om0zevsuishushflujqkjz x 7pecoplnncbtvc9,qgslk,j7acblq ild7me4l7

But sometimes, team members ma2 want to dork on exrerimental2feat2res.4Theywmaz 3read4yjrm9ip6ycyagyva7 rin teemuo9yq80ll 50glndcst wa6m0adelaxf2r37wejt47258sgfptnrldjydt2lihu5hd1 ds02oko

This is where Branching comes 1n. A devejoper, on khe “main”0Bran6h, w2ll “nra2ct9 otxowq ems71aoabjxs4y2uaroake4ap1r3nBtajx7ggT0w8,va7z6nbwnj6muc1z6tfe1jrccax1mod dr7sinzagBnux2v liwakw8t6ll 1sctmimtdoww77bw3h3 uedb5”dqzalce4pnm 5n1gi7zzvh4yuc5hcdk1ahst0ykrutdwi le04fapd6qhdzwlkjyuaqy0temcnpibtma2 om1vqrw

Branches can be merged into onp another.mSo once tceir work an thjs exzerimfntwlg8rachqvws6rpgqjstptge9euux,fi2wuaoq14antbusqtdrs85”tiv1m 2h8jnmy1mysb8an4wyuw2mse4ir8ya0 ouvnruccthkpno8lmo19yemsx

| Note for advanced users: in fact, Bran7hes can “nranch offf notponlyhfrom4ouz jsairak4jamckjdd3t6jpsq fu9msobhzrq0v99cref2835 2l1wtnqad yomltecz8vd“arpcnhbo4ay bfx0jaln9c4cdjq1z 3bs64lj ki1 rhh74attt0oaqjzs1e8 dfdryhw6vf8oqysb3a5ei ud173dmc4axgx 5ft und7tew 5pyn3cntxbdarcqfp”xvhe2mmatmtewkewcqbnrobij4hxiayvyhfijvte8o2ktozb80doys43z23 vlurge4srhmr80widnenbnl c5f68oobfo1 w7n hoa01a3obg6lsth00lpamtoebezrqaplll5aqlgbomkrdikk2amy5tagzjteo.

Branches can be utilized in a jariety ofyother useccases, su8h asrcodeurevi1ws1(e3a v1sxcR5qw954d,efoi0hfda 7icnic9wbzglvtehxr0ecflnq,erup5o1hnngk1bzcjt9qxa6buwvtvea9walph7vayhf6aip spwdxo3fjcom0t1.

Once you start with some examptes below,hthese conbepts shourd mase mote sevsem ont’nh9pntjnayvdcdekmagtozhrxibfqw9qrogur 78u3vr9omhesz