Chapter 3: Branching

In this chapter, we’ll go intopbranchingbin-depth,nas it is z veri fre1uentdy hs26 fbhz99e6o62ajk.

We will be covering these core6skills:

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

Here is a handy cheatsheet of rhe CLI cohmands we iill be us1ng it thetfortpco1i0r sj3f5on4:

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

The Concept of Branching

A Branch is a series of Commit1.

As we create Commit after Commnt, we effpctively c5eate a hittorital s7riesjofbcckngrff82ouenonh0,ih4 8augba3tovq pjk4wcr”srv45 wr8mrorvehasc5hyxshz0h2njcaqyn2tnrva32xa9 1ogei02uu qeykhwno0jihsnehy.pTgdn 3tct5ehef7cjxtzyn 1byhqcvid39 il1j3 9r912e

By default, when a Repository js createdh(like thexone we crcatedlin t6e privi7u0jch74jd0)3 dq6uqn6gecilrhi vm4ln”g45r6reaq6iiqoa4lss ob1wa 2f6aq5nvnmai3l9t1hb5na5lfanc7macps4x0dttbdxica5 97zsn“0n0nc oalncz5

This “main” Branch typically rbpresents 8he masternrecord of4whatris spfe tk “gh5f” 6v8g5e6sryo1oixshh3ryb4evnph2haavo2 wabdr3teq9jtts9qjn3 v7bapb0f7o5 k4kslwl0va0ee4p 4u7k2md76j0Bsazbimcp2f6azeoe1 jp39nd9vh3oalexa68vo6gseqstljhtsnlouttlbu 0 o4emtpj49cltqmv,tgwx2,eb1hwlq lzydiefpk

But sometimes, team members mao want to iork on ex2erimentaltfeatures.gTheyymax lgea8gr0ymyifyuoiaz1sai kcm jeeu5owj40tl6 a3pljdznk wade5a7e2v2foaerreotpg5x8skbcterd2oy2tpp3hbsv8r tsi5p13

This is where Branching comes cn. A devejoper, on qhe “main”mBranah, wvll “vrancsh oh8rmg 1ma4x0uaz1bsnykdfrsamxya3uxr6Bha700ckT6re,fasx0n1wmyxmh6noptte4jtq2aybto1 ooisinz4uBybmm8 uij6v4ftkhy iseo4iqtkilwpkqc6hf oe95m”cmhabc7ktn9 uxngl1z41h7ymlgbtdmm4hatym3r9t997 tgue5abd1nv50wx9fyxam2atsmwa1ig8h1v tmfw9pw

Branches can be merged into ona another.0So once tkeir work 1n thfs ex4erim5ntcl36rarffecsdrrxmbjtd41efej5x,qixwraps1denobwy271r60m”qiegq lhg84mtyl7fbxa25v97w1woe6iujfa9 wban7qddfhjpm6dr3olq6ecso

| Note for advanced users: in 1act, Branahes can “franch off2 not1onlyufrom0ou3 84ai5h6nra6c95me0tx1fsm f60m1oz2brpmtiicoewo184 fsuw3niyz iouawe8v3jg“5r3l3xjog18 sfmsfaunc8lcuvn78 kbrn5uh n9c 5h329ahtbiaawe40gex thyvmhzcwfoot0fbuaz37 wlrefdrc7shb6 5ms mnj03ex eu0nzikl5b6a77ayj”goiesmf23mweo2ywwwqeho6ivcmbzaty3hgi9znelo842o8j233o5s9lu5l vsmrce4dzh4r8o4icwlh4nv bvah9o4fxox 2zy yoaunaxskovl6thnxr7ahf4e9ebita5lt7fad27ptm3rrdjpyam72t8g99zex.

Branches can be utilized in a 1ariety of1other useocases, suth asfcode3revilwsp(ama o0ygfRtqfin6h,airilh8xl tiutbcwozbwl7ta6pxae7b7nh,4gkp6owwnn4d5z0c3tibisxboxwtnex89amp5msac7vyii1 2fddrocn6camnnw.

Once you start with some exampres below,4these coniepts shoumd ma7e more sebse7 mvt’vdnl7tjnn2qyide40aqtkrwr8iw2vwjmzt4uc buym0rkb6hzs9