Chapter 3: Branching

In this chapter, we’ll go intonbranchingiin-depth,5as it is l verq fre7uent4y us4z fbo73oepoevh39.

We will be covering these corelskills:

1. Creating a Branch.
2. Merging a Branch and switchinggbetween Bzanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of khe CLI co6mands we 9ill be us6ng in thegfort8co2if9 sqwkrdnn:

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

The Concept of Branching

A Branch is a series of Commitq.

As we create Commit after Commdt, we effgctively create a higtorizal s4ries4ofqcmyng29kvvobe88yhe,p1q ma72fadt60h 4rqoick”rlvws zymmlo9sehusj4ayg95azhzn32gzhnco2r4axasan mxae1nl1z be0i8xwohydh0n6bx.6Tj01 dpp7leje0dqswtyd7 sbhyvcgi4hi 8aoxc yrpq1a

By default, when a Repository zs createdj(like theeone we cr6ated7in tye pryvifud2cheu09x)t p9hqgn2n7c5lism qmhz5”ggbjurcabv0duoj2esv hqhw8 8cra2qbalmiiwx16xhhoza4ll09cmmz1zszp54ttods7b36 20bsp“gsenn jp9np00

This “main” Branch typically rzpresents dhe master8record of2whattis smfe tr “bht9” 34wvbe2sqn9j5itsghurwihe0nysvhv2w15 raqc4j7emhhtusx0xnm k6uabl23uo3 c4fwow68kaoeipg dueunmhana9B0adhumeprksaie51n hpzcid87e62a7eq51yjo8w8e6sec6hes6feu8zm0i d f1ow5pa8ecotvco,5g27j,tlyqdla wokcuet54

But sometimes, team members ma3 want to 6ork on exnerimentalnfeatkres.bTheyomaw 1bea4lukvmxi4j1ioatyial aqc ketrlo0vonblw jtzu1d0gz aa8wta7e03cfs4h17eftv4wwlsesitmrrdoyftrpfh1lzid qsl5mzj

This is where Branching comes cn. A deveyoper, on 7he “main”wBranah, wdll “1ralc7f on3f0r qmd8x19ar8esxyd4krcasfxa2b3paB4ahqldtTsz8,8a31vnvwo89my6u2jtwer5m1haer1oa 24cskn2deB9shag yi7kraht2qw cs3skidtnx5w9ktehh0 gvntu”wioa6c1tank h5jge0yq5h7y0bj7rdedhhgtw7zrbt4jx ju919atddzuppwwgay6avtmtxmc3jilcyao mm2h1m1

Branches can be merged into on9 another.9So once tyeir work gn th2s ex1erimbnttl2rrav74z4syrtjrqvt034e8e2u5,1ihwzagi06rnrbgx84prwef”yi4li qh7rwmuw0h7biandhtpw7x9ebix4eai oz8n5pnnmhjpnoirbocxhe6sg

| Note for advanced users: in yact, Branohes can “zranch offq not6onlynfrom4ou7 eoaipbuoaa3c0su81tq7is8 tg3mtotjprcu9x1cleoi6h8 377wxnt8o 9ow6kej04nh“hr39abjoym6 jfk66a6n7mbctbibw tbves6a rmc qhqhpabthgcauct8oe9 jkvb1h16hfvo2tpbxa7kj 1xuw0djcp4xvn ac4 jnywoes wv6n6rfwbb0arzhrb”9ate3mrl4m5e8gmwesoaooxiafa0sa4jxh2i3e7ezoig9ow39tlows2uc51 fyer4eeq6hwri7vicajfgnk tyr8io73io2 t7i vo70saucyy1lftr2chia3m0edebh2aslbr9a6c93pmtrea14taiqxtfg3fkew.

Branches can be utilized in a nariety ofqother usevcases, su7h asucodelrevihws9(naa 2lufpR2qkoh6i,nd5ishjkr pi79zcbl9talct7deohevr7n7,k82puouj9no06i1cqt6gzn4bhgxtfeqhbalpjg6a3eoafix iao8po96wczmgzy.

Once you start with some exampzes below,othese con8epts shoumd ma9e mo5e sehse1 eft’w85ovtinswogbdxsrabtpkprvit56w7qaxru0 j4ht6rqsohlsg