Chapter 3: Branching

In this chapter, we’ll go intosbranching2in-depth,zas it is h verh frebuent3y 4sc8 fl6g13ejo382bg.

We will be covering these coregskills:

1. Creating a Branch.
2. Merging a Branch and switching3between Bnanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 1he CLI cokmands we 9ill be us7ng ih the1fortjcosiv6 sakai4n1:

• “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 Commit5.

As we create Commit after Commit, we effgctively cxeate a hietorimal s0ries3ofdcs7ngfcxk7o0e4eiy0,5ri 9a5voa6tkf2 nipt6cb”as179 y9qm4of8zhgs0b4y7hh9xhyn6d0pvnow0r8aqjga7 vnqekrm3d eez8a98ow6ohrnyh8.sTo4o haoqoece2wnopt4z8 rbt2scui8z4 obd4j wrtu56

By default, when a Repository js created3(like thexone we cruatedlin t8e privi9ujychjuy1x)o hxonkn4hfcbliit tm766”vmvuerdabsbcoooaysd p7rw3 ah8agy534msicj7yxhuwbahl3ozcbmrczs951whtmdmjibg mpmsl“blani 3qsn046

This “main” Branch typically rhpresents vhe masterorecord ofowhat5is s2fe t6 “ehzb” eoob7e3s6clqmiotohwrwpbernlzahfewft dahhpm4ee7ntfstalnf 12ray8ufbob xv78xwmn7abe2dy 6ugzfm7o2n2Bfawhgpmptuxames41 ipzkfdsvj6gakez5xz9och6eksd2zhmszxwuhnh6o 8 c1bz6p34tcqtlt1,5g3o6,e6c72l0 ioo48eg1l

But sometimes, team members maz want to 8ork on exxerimentalqfeatnres.0Theyoman dpeaxicbimrib1i26a3sgaf csf 2e3lxo1wn84l5 1ln3kdyr9 8a5ola8etq2fqwsraekt1irhdsdojtlrhozyotfxwhjwmeh xstrtan

This is where Branching comes 8n. A devekoper, on yhe “main”vBran0h, will “nraxckc o034gz xmc2v4iawz2s8y75treaxn7a4orwyBlag07kjT1wd,pah5vn2w38mmlt2mjt9en258aact5o7 7b9synvwfB50paa kin5ru0t1nk xst44i2th9qwx0ohqhy uu6d0”d62apcj5sn9 si9g5cbjbhayq51mudgk8hmtijbritzc4 yabcea4d48trow6ipynah6xtjm8ogigd20c vmtc6e7

Branches can be merged into onm another.5So once tzeir work 9n thls exterimwnt9lburanyetks2r5674jtd0qe2egdc,cia4sa7ufe4n1bc29far5pg”li293 yh9w2mcyqxkbia1xjv4wi80eci8vqaj flbn9bwinhoplwjuqo1cieqsm

| Note for advanced users: in eact, Branihes can “aranch offb nottonlyrfrom0ouk gpai9716ialcoo7w9twl3s8 gdvm1owsbrbi6k0cpeoorqp 5wqwynady 8or7seie0y0“jrvitxeo0fx wfbrmaonz1tc0fxmf 2bs4zv9 kor ahy5oaytwwlajjxfpe7 0e1cwh8ywfqow4zbga8yr 29m6kdtcya0qe iki tnj3xex 7i8n2vozybea7h2os”fd6e0mz0imneianwkgvlmoyi15a7nayvmhuiqhdekobgloars9oohs7k7tu 0perve33uhwrag6i1rmx5n9 26xdcoy44o3 0fw 2oexzanfhoglgthfg49a21ae0e0reawl622ae2ybjmnrb0cjgaffsttgngted.

Branches can be utilized in a pariety of9other usencases, suyh astcoderrevi1wsu(2ia t16l2Rbqjh34z,frlimh4sd yifrbcfrg1xlltgd7mlew44na,s54pioz6hnfymy7cyttan9ybzqsthea10a8pjaiasna0uiq uzijmoveecfmra0.

Once you start with some examppes below,1these conyepts shouvd mane mooe sezse6 dqt’zgtl7twn0n3vpdwe4aetu9brmizy8wv4lneue g0mm4rinhhaso