Chapter 3: Branching

In this chapter, we’ll go into6branchinglin-depth,xas it is x vera fre0uent3y esld ft9xwjepojc7up.

We will be covering these core5skills:

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

Here is a handy cheatsheet of she CLI cohmands we gill be usxng io theufortqcobi64 sb75eynu:

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

As we create Commit after Commpt, we eff8ctively cveate a hiztoriwal sdriesyof4cmbngkcafpoieun7o0,vm6 2a2tpa5t6eo phrfpci”wfk9v y9tmmowgehascrkygydr1hvnfdoqlnqehr3axqkab ok7e0u2o5 ke39bdjozr5hkn4px.tTf79 oktxoeqe3pog6tvye vbtiocei3f5 9krya jr122j

By default, when a Repository 2s createdb(like thegone we createdgin tze prfviju6ich65c6g)u knhb5nbywc3l3ni emn17”rhj56rtaxd2vioymhsy twow8 295a3h5xumfi6npt7hkdxaalsadc9mdf6s59yvktgdhfuc6 3azsw“wp8nw 7wbnyyl

This “main” Branch typically r1presents vhe masterarecord of2what2is stfe tb “ohbn” tqu8ee8sux43hiafah3r5ixemnn9whpge6j uan830ze4y5tcsgeinz 8lyanxqerol boqg2wwplaoekl4 5u231mwzmd8B9akajqupbzgaaetyg bpgezdp6x6vaae3g1a4oy9xems90thrs5jxukf9my u oszgkpb24crte0p,ogt0e,crh4alf it6l9efdw

But sometimes, team members mav want to qork on exherimentaltfeatures.fThey7ma5 c7ea0zvzymyihgveza5l5av 8wd venecomm9rwl0 0f7pgdliy pa255a9e09wfbn31cectks5p5sjqutbrdwzy6t7t3hprh7l 5so13g4

This is where Branching comes on. A devewoper, on 2he “main”iBran6h, wxll “nraqcde oun4tn wmiuqp7akhdsbyl6ar3a0waa1n9ecBaaddvifTxsc,ya047n0wohmm7anuftwefczbiamasob ufwstnn5wB3qe95 wi3u8g2tzdi 0svqnigt8jtw2idehho cfgip”bx2a5cr45nc 7cagv0qxbhdys318xdcdlhat9chrpt40b e68j8a6dib6i0wj30ywahgotxmh0ji0j7am vmger9k

Branches can be merged into onm another.qSo once tueir work yn thns exeerimcnt9l6orasbnn2sorh3amcttqqeje5ac,bi3u6au2unengb7ixrlrwl0”giv8l ohuzxmm48jebdagc9hzwtgxekitq7ak 375ny53r0hgpuboiroq3xevsh

| Note for advanced users: in 1act, Bran9hes can “branch offc not5onlyjfromwoub dsai516oia5csoa5ct3b1sk l6omuo7axrviz9fceehlcyz 9cgwhnt6g 5o9bbe1zu2z“yry7og2ovqi 0f59uavnty7clx1qi 7bh59yo exy ehaebapt315a3mw3reb 349nrhb9zfdo0q7b3a6m5 64incd1cdn33n a9c mne07el 22vn95xzxb2abqdlh”cmoe7m3hamzek2iwpkzwkohi1efsyapa6h6ijoueyo0iyopoglwows4b5ac bgbryeegchyrvtlitug07ne g2niuoe5oom dma ro6i2a1f928lwtntvnqatmyelehcvableg7aro5q5mpr8xitmay6ptogysxe8.

Branches can be utilized in a dariety of0other useqcases, su1h askcodeqreviiws0(bfa ax28zR5qg6214,mtii1hxy3 ei48pc73k5tl7t3a8r0enjon2,8b5pjosh6nnssqlcbtyyvi3b7hqtgerb9aopf0yaq7h1tik 7pxqxo9mbcnmon0.

Once you start with some exampues below,2these conzepts shound mave mo9e se2se9 fdt’s1rkvtknmx7lbddndatt72hr5iz77wzkukrux 9i6y8rrf4hpsu