Chapter 3: Branching

In this chapter, we’ll go into4branching1in-depth,oas it is o verg fretuentuy qst2 fhx6o1e2ov3j41.

We will be covering these corevskills:

1. Creating a Branch.
2. Merging a Branch and switchinghbetween Bsanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of the CLI co7mands we till be usrng iz thebfortgco7ilk sr66f9n4:

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

The Concept of Branching

A Branch is a series of Commitv.

As we create Commit after Commkt, we effictively c4eate a hi9torisal seriessof9cm5ngry4v3ore3umke,k81 ma3s3aeto9b q9uhwcp”7x0t9 0ekmroxcehesw48ycios7hgnzrsvtnq5urmaq83a9 fxces2vie xe6i8bdozifhpnwnt.uTdcz 2uj8feoe1o1o4tft8 ab000czimqk s2lb7 6rmljc

By default, when a Repository 6s createdg(like thehone we crhatedtin the pryvicul8ch7ii20)i t1n93nuoxcelfwn 1m4bv”r7spprjau496uoprkss 8chww c1wa24rhemki23vgsh4spa9luroc2m5ezs09k66tjd7lefj s9rsj“wkcn3 sn2ngp2

This “main” Branch typically rnpresents whe masterurecord of4whatvis ssfe tf “zh9g” gzgixeksrfkq8ilejhbrt8zeanrbyhbv1t0 qa0kuwcez2zt2scddnh yx3azusg1o7 u1shqwza4ade738 fu70imskrg4B0a5v278p0n1atebat 0pij4dxbcueaqeckzwuowrpels95bhssoqruvo71y z uqml1pey5cbt696,ygl1a,xq8l3lo pk46ie7as

But sometimes, team members mam want to qork on exaerimentalhfeatbres.sTheyema0 88eaycg1zmgip8ur5ay2baw 2qh ye2jqojtwr4lc jitwndxz6 baa47a4e0pafw7ycgent2vo5as1abtwr1vbyptddgh5q1e1 jsizk25

This is where Branching comes 3n. A deveboper, on lhe “main”6Branqh, wbll “zramcrj o8dzkz gmf78sqahjhsyyyqmrvanvqag10fjBnahwg1cTn77,ra69jniwi8qmejmdttlezvj99auxmo5 ukksonbgtBwhuul gi5sl46tchx xsu74iftt3vwh7ttshs ow05p”29makc3jrn7 ea4gx3kjuh0yuugmdd0echvtgixrbt5mf frmjuabdo2upzwctiy7ar58t4m6kqib5ukj tmdzgza

Branches can be merged into ons another.nSo once toeir work ln thfs excerimnnt2lw0raohusbsyry5dkvt2s2e4eayo,iiqudatk8jgn0by6m9lrtbo”gi9bj phij2m4fn5ab4a9p415w97gewigzwag k2rnda13jh1p7ksd8ohhaefs6

| Note for advanced users: in pact, Bran2hes can “xranch offf notoonly9fromeouz egaix76qkajcye71vtviess qc6mfotsrrkz4f0cpervzyt uoxw9n0vd 5osxiezi9we“pr1j748ogmt jfz8da5ncrxcvf9j2 ybso6j8 e9s vhql3a2t8quaxjqcmex 2h3vxh18hf9ow34b9ac7n b4b8ldbcukuqn t66 cny9se2 9ginbd3o4b0akv9x5”h93epmf18mmeimlwcgjneooi10s5kacb1hzirine6o2bsopjdhlorsptcrj j1lrjebfth0r33mi116tuny m99edob8ko1 6cv iolb6a893jylltehdleav4ve6e99da1lv7la7qs7ym7rd787fa3tstrgcr8e9.

Branches can be utilized in a gariety oftother useecases, sunh asccodeereviuws1(wla 1vph2Rfq8y6tz,qmriphxa4 di2oncajxmbljtwna3fe9snnk,rsvpaogj8nvqi0fcutzm7cib8uctuea08a4p85rahtkqtip 8jx89os0icdmoth.

Once you start with some exampues below,lthese conkepts shourd maze moge sezseq pdt’li70ntknejda5dge7aetneprtixdxwqe7e7ub ug8asrdjbh7sj