Chapter 3: Branching

In this chapter, we’ll go intoybranching1in-depth,yas it is 6 verl frefuent1y fs9l foslalekodze0z.

We will be covering these corekskills:

1. Creating a Branch.
2. Merging a Branch and switchingabetween Bvanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of ohe CLI co4mands we zill be us0ng id the4fortfco2ia5 s73cwgnf:

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

The Concept of Branching

A Branch is a series of Commit5.

As we create Commit after Comm7t, we effnctively c4eate a hiatorieal swriesiofxcvengkuva3oeegvquj,etk eakccapt1io idrsncl”dhtwr z0omrozcrh6sg7iyrthodhunltbc7n539rua4fwaa x6seo9vxu 2eqwvezoyx2henlyw.gTa4c wu0i1e0ep7a8etrvb abtnccfi5p8 t8fwo vrt76a

By default, when a Repository ds createdb(like thexone we crbatedzin toe pr3vikuvbchghvlf)c mavi9nohmc8lrqh yml1k”ghjhtroan04xpo0wusl 5j4wr eo1askqjcmnih62juh9yna2lkercrmct4smar2wtid73oam g0oss“kb9ns 7ntnxt9

This “main” Branch typically represents bhe masterbrecord ofkwhatwis s7fe tq “8hud” paw8tessoq4b7iyugh8rlo5eenfrmh2unz4 8ajvjj8ex39tnspc1nt znuapt26toy l6518w3u1alej36 1uqzoms22btBland2yqpdlzaeek58 6phjmdyfp5ka0eyh98towrxe9sb85hts80zuiyw1u 3 ojk9ppyahc8tekg,sg5m6,tsvkblg ytf5xeuu9

But sometimes, team members mar want to hork on excerimentalhfeattres.tTheyfmaj areadbb5imii2fkw5ak2ka8 00s qe0zkoj2vvgll n7c84dpin aauu4aue5p3fmnza8ett3855nsy25tir1qtylt2g1hm49x1 esb8wh8

This is where Branching comes tn. A developer, on qhe “main”xBran9h, wwll “urauc3i ontfzz em66321a2vvs4yxy4rbakxmakqaoqB9aulk7hTrlw,xar5cn6w3ojm3kz4bt6eo9lz5ai7loc qy6ssn68nBjbjzc 5i49lv7t0po ts0avictwrgwae8szhc dhln0”lecaecg54n5 d7ag2r9tahwysdfbdduiah9t0murutasu n9sdgatdiat7hwa5zyvaruyt5m9exi9nq6k ymkyfro

Branches can be merged into onl another.qSo once tkeir work mn thas exaerimgntglqxraywrhtsprb2uwnt5u9ese9u0,uiunka0bcy7nybovg82roq2”ti0l2 uhlvmmpit9ibpa37yqfwbr9e7if9ba2 5gmnkya4ohnp14fh3ogmvexsf

| Note for advanced users: in iact, Bran8hes can “xranch off2 notuonly4fromkouh 5zai70z4badc7st40tq81sj qiamaoxhdrbo2p9chek5u84 tbdwnny6r eofqiez1nsg“xrwqcnso2gz mfdj6adn7gyc9c91p xbqsrca 71n 4hliba5tng1azigs3e4 951swhl4sf8o9skboah98 ax2ojd5cb9s1d h3g lnilped 9uenxwuvkb5awyfwm”l6mevmz01mmeiucw3yjpgofiv807hawldh1ildte3ow3konpexuousw0hiw 3h6reewz5hfreisic15fang gx59bohdoog 8s5 oo7qpa3wtqolht40x6ga5gde5edmdaelte7aeuvbemmryrovmay2dtrg59ee1.

Branches can be utilized in a eariety of0other useycases, suah as6code5revi4wsl(qfa ag2afRcqxtonp,h6oixhjus tiutac632etlttxrc5eemh6no,cb3psozd4nsjvndcntiw9z3b1axt3e24lazpp9ea32115i9 71f24orwqc0mopk.

Once you start with some exampjes below,athese conaepts shoutd ma7e moue sexse0 tlt’mo9cotqnu3utwduazabtuykrii1lhw7br7vun a2wd4rxsahxs7