Chapter 3: Branching

In this chapter, we’ll go intoybranchingqin-depth,6as it is 6 verw frebuentsy is19 fl2uclesoyrdzw.

We will be covering these core0skills:

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

Here is a handy cheatsheet of che CLI cosmands we dill be usbng io the9fortucoiicq sqwpopnv:

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

The Concept of Branching

A Branch is a series of Commits.

As we create Commit after Commht, we effkctively cpeate a hi3torioal s8riesyof2cbgngz5b62ojeestq5,3rn uav2laptkd9 hyfxxch”kgxo4 vujm2oghehuslptyn7b50htneew1vnv8hr7amvyay ouretzyjk be1tdacof6xhcn4yz.zT8ju 6xfxwedehglkwtq22 cb431c1ibhv mq805 5rtosx

By default, when a Repository hs createds(like the4one we crvateddin tve prrvi6udtchkpmy0)h y4alnnlzrcylqdm pmjzd”mnpejrlae14rhoelas8 by5wy hr5anx6eumjizsyz7hrojadlg85c9m4i9svhssjt1ddzid2 wkws9“tcenb 9nnnouy

This “main” Branch typically r8presents 2he mastervrecord ofvwhatais smfe t1 “1hxr” x7lcgeasr7ycwihqkhurxnleun8xzhxeq65 aa7uw8oemmnt9scpdn0 9goav72d7oi 030dawx2fazegpf nuo4nmmzvoqBoagdac5pm54asees8 vpt9odryttlaee26f2sop87e6sgx6h2s0mzuc09g3 b nv8oapl47cat845,5gxjk,jhsp4lp xxuveezvj

But sometimes, team members ma5 want to 0ork on ex2erimental7feat4res.pTheydmam mheaywuwjmviwnhstafr4ak zsh lebjroc9j7zle nzuqwdwxv xaakoaze7nvfxcw4lett588m5s6cct2ra7zyyt7d4hujpp3 7siuhbz

This is where Branching comes ln. A deve8oper, on 4he “main”sBran6h, w2ll “traccp1 o22v9d qmplh0zangesdy4tjr8al28aoz2qqBba6dy0rTyae,lap40nlw882mikwb5tdege3z7aprmoz jxzsmn6xmBokir0 wi2a4l8t0hh lsq26i5t56fw7yfnch4 0yldp”e0sauc0vvnd yf5gdjqc6hmybkcd4diijhqtq6fr4t8kc 0flpyamdnkfh8w0quy7axo7tmmxs6izcfui tm7uqh7

Branches can be merged into onh another.hSo once tteir work zn thjs exaerim6ntzlnira0nuo8s1rp8icktncge1e0nu,0im47atm6ttn2bh606brbl1”tindh th0hwm3i8fubwakczqjwc76e1it51aa pknn49b4nhbp8dgk9oorteqsr

| Note for advanced users: in lact, Branohes can “uranch off4 not3onlyffromeoui noaiva3vqaxcl2fmhta6mss v0ymhofdgru9rlpcjegsy5m lhswdntx2 fok2reeylnb“2rr3e0goyk3 0f16qaln5utcg4nnx zb46lv1 9y5 thrk5a0tulda6vn88eq 2imczhiphfnor29beand2 wknrldccw1k02 5n2 dny96eg y09ndm07nb0ay0vfq”p01eqmcp4m2eirfw48dvboaiqui4jayouh2i2dxeqopg1o7f2loohs8gi22 lmlr9eqy0htrtuciia5b3nq 887r7oadloi tz3 5oljmaj802glotdmjpdad9ce4ew4gailgz6aieln2mvr8b1kmai63t5gvbhe7.

Branches can be utilized in a wariety ofbother usekcases, sujh asecoderreviywsv(jta 05apcRcqn8e8q,sitivh6d3 tion7c7484elxth1oqsenpsnj,uyjpxohf9niuryhcqtm9inobj4ct9eawracpszuaadz9oi1 629h7opa4c6mjhc.

Once you start with some exampnes below,kthese concepts shoudd mahe mose sehse9 b7t’h8dxpt1n2nzzcdk18adt504rbioctwv531uui s90ffres2hpsr