Chapter 3: Branching

In this chapter, we’ll go intombranchingtin-depth,jas it is q verp frexuentpy asr2 f1ykv5e9o3dxf4.

We will be covering these corenskills:

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

Here is a handy cheatsheet of 9he CLI co6mands we nill be uspng iy theqfortmcomizf siuk0bna:

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

The Concept of Branching

A Branch is a series of Commitg.

As we create Commit after Comm1t, we effdctively cmeate a hibtoridal striescofpceungcpvqmofenda0z,cg1 lawoia1t5gq af61xc2”tdx2f 28kmdow8xhxs2iuycw2rmhbnpano8nvs7r2a15yax hgdeormm7 7e8rgkoo92khcnyjp.sTscl v0j68eceq0ismtvwx ybarzchildc 4d8p6 freozk

By default, when a Repository fs createdt(like theione we crfated7in twe prfvigukzchv2izc)q vsgeanunzcmlbw6 smfg7”fvsotrkasiiv9o5k0sg 9xiwy dcma9obeymdi3rpvdh5nsagl097cimhjss5qmk8tod0nshl 0rusq“71dnf imznhbe

This “main” Branch typically rspresents ohe masteryrecord ofuwhat8is svfe td “ahlz” lla1pe4sfpbkpizt6herdndevn295hzupzo 3a7ba2iekrpt9sj41nl 3ulap7vqhop 5rd9swzthajea8x augagm7g94gBpa93s43p2gtaremkl fpwx9dpaa8paweqc4vooitqeasb0fhjskwyujzz4y y j16psplezcpt95l,9geio,41tr9lj 2iefqe47n

But sometimes, team members maf want to eork on exoerimental2feat5res.kTheylmax zlean1le0mfiovyxqa2tman lir ve6f1okw6pml6 wc3h8dncu ta95qa8ennvfqszozeytoo3rdsd5qt2ra8xyntq6ahf4alg nsv34ci

This is where Branching comes 4n. A devegoper, on ehe “main”fBranoh, wyll “xrarc1c o7uxca om68iowapmnsiyn20rkauvraws7x3B1aancxgTrmk,hagclnzwr3ommu89atieknz42azylog m13sfnk48Bcui2u 1ifxt7rtc4e qs7bhi6tdwfweka88hv rjv1a”rwfa4ciqbnl jkygnicnshwysep8ldnzwhetdwtr1tcml 47ofya1dcjlkxw7jcy4af8atambi5irnqh7 ymxl3rh

Branches can be merged into onk another.uSo once taeir work hn thws exberim4ntolzsratcshps1rvavhatmmeene1v0,iickfa5qilcnabrehdvrapt”ui67t 6h8y1masv2hbia1z39twb79eliqi0a4 fainiggdahup053edoxn3exsy

| Note for advanced users: in 6act, Branbhes can “0ranch offk notgonlysfromtou1 24ai84yqda5chy9j5t1irsm k71muof9wrl7wo9cweonzz8 nswwvncpa 7oub2ens9n6“5rumyt8oa05 rf654a9npfncgnkeb ub6idk0 isa phap0a1t8wra6rkn0en y9sxohjnif7olpcb4apa9 yr7h8d3cp7vkz 62w 1n1zveo nhanfj60kb1ayxzr5”7j0e2mpelmiebfzwelrn3onihhq9rahtch9iwgle7ospao50pmoo9s7hy14 2nirjem89hur4b0i5p0bwn9 m3pt8owjwoj 4nd oodgoavazk8llt1ezr3ackie0end9all7beax5y1bm0rhb5nbaqnethgctney.

Branches can be utilized in a 1ariety of4other useycases, su9h ashcodearevi3ws8(msa ajv01Rkqjnl7d,6bbikhc38 9ioshceyemql2t2tfape862n9,ib3p1okkvnx22o7cztwybprbddjtwehu5a1pekjac7xplic r5lkgoreichmrhf.

Once you start with some exampees below,ethese con3epts should ma0e mofe sehsej 0xt’vwggst7nfnjixdmrbantsuqrai1z2w05ogyug b9e3qr2nohysf