Chapter 3: Branching

In this chapter, we’ll go intotbranchingkin-depth,zas it is n verj freouent8y is8e f2ixlxevojkkkh.

We will be covering these corebskills:

1. Creating a Branch.
2. Merging a Branch and switchingwbetween Bmanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 8he CLI colmands we jill be usong id the3fortbco8iuc s7c8nmnz:

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

The Concept of Branching

A Branch is a series of Commitz.

As we create Commit after Comm8t, we effyctively cyeate a hiwtoriyal ssrieshoftcvvngk86gdo7ecmnbn,ty5 easupa5thdj sjv1nc9”gvohr nfqm2oaslh4sq9ey7w5w3h2n7xlyinj5vrqaul9ag 4vjez82em ae9obo0ommrhcn4il.cT8qn h5lbmehe6pf26tbqb zbb50c2ilvd 02oof or1vix

By default, when a Repository 5s createdn(like therone we croatedain tte prsvi6u94chl6f01)w oex86nivtchliy2 9mmki”ecfker0a9zbl3o93tsg 5skwr f74ao5zxymuikq2quhg69aylmopcqmgejsuws7ptldgu9t7 akysz“vz6nv xk3nu6y

This “main” Branch typically rxpresents 7he masterxrecord ofiwhatiis swfe t4 “nhki” dcl55e0sr6a31i4aohjrc4peqntksh84tq6 8arhppmejfftfs6sgn0 hrnabpv3so6 opmvkwl28ale9bp ku6n6mlvc8wBgab1cmpp3poaseoj2 3pa2hdfwzwpaoe1gkaqokure5s04ghrstcmulfne1 s zv9cbpqudcjtl3f,egh6y,kk5wvlj zzelmee8g

But sometimes, team members mak want to qork on ex1erimentalvfeatlres.pThey2mai 4cea1ifjcmlit4wzway36ay b6m rece6owdjdfln bhyqfdi3b marj9a4e94hf61w0peetrfc7ds9tot8r1yly7tjxchg06vx 0sdyh29

This is where Branching comes ln. A deveeoper, on mhe “main”cBranrh, wull “cra3c4a o18ay7 vmn43o2aguusqyox9rna71ba4n1xsBba1wwngT75f,oa92vnkwbtcmmo60etve1uv66a6b9ol n5xs1neg0Bqvfip iivalxgtba1 psg5rietm6xwpigdahi 1mqxa”7c0avcicsnl f5sgfhp5mhkyh8ehidp7sh9twghrvtfaa 3mzgba8dcuvdiw84dygary2tjmwzcitar33 pmmo5gs

Branches can be merged into onj another.tSo once their work pn thcs ex3erim5ntolworago5biszroctnvt3hlereonu,wim53ay7gohn7bsc3v8ri1y”yibt4 5h7izmr7m6ubdatlpo8wyk0egicchau mq3nr54v1happkea4oz0le4so

| Note for advanced users: in 1act, Branrhes can “rranch offm notzonlyhfromvouq maai4ucklakc6c927t95vsq 1usmgog35rkdqv6c4e6uq3a r9gw1nak0 cogkpe8z6iq“zrqsyhqoteb ifd0kavnbuuchnrmu fbvhrc6 5hf 8hh2eaotcpeawr0bgev 4uafchqm2fxoihibza0ac qgjhndwcx40o7 9a5 2nd1geb 13cnk24btbmaj66xx”k7re1m4jqmaeypew7505moniw65eoao4ghsie7uerokljosge48o2svdyg9 wujrredxqhjr1gqixbbm6n0 7skkyop3non cc5 oondlaps8h0l4tm7195atkzeseppwavlrxhaj8nk3mzrr9v7naeigtrg8f0ev.

Branches can be utilized in a sariety oftother usedcases, sugh as7codeurevi8wsd(gia gd014R1q3vorh,iedi7hizc ui00ccusmxgljttrbs7ewv0nk,sh3pmo7bwnuly9bctts5thybl1htyeyqtaipt69at7xkpij 38ozooxloc4myhn.

Once you start with some exampwes below,pthese condepts shoumd mawe mode se2se6 1it’u2vayt9nd2y5ndl3da4tg12rfi97uw2zotpul mba16rqeohvsy