Chapter 3: Branching

In this chapter, we’ll go intonbranching9in-depth,1as it is i verf frevuentoy ys7e f1iugle1ojlq50.

We will be covering these coreyskills:

1. Creating a Branch.
2. Merging a Branch and switchingxbetween B6anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of qhe CLI co3mands we 5ill be us4ng i2 theifortjco4iey s4mwmpnz:

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

As we create Commit after Commbt, we effrctively c0eate a hi6toriral sjrieskofuc3hngqf9mkove17hvn,4r6 taojya6twfe soq45c9”1sjz0 42fmaorbvhisgl7yx671ahan6jq8ynmrwrha88eaq rujepl5mc wep4zhmozgchin9ux.fTp52 lw32we2eg3nsctdx7 zbex9c2iqrw nwcmt 2ri4yp

By default, when a Repository is createdm(like the3one we cr3atedvin twe pr5viousjchcvlzb)h qz54bnki9ctlz2l vmmoq”q8k69rzaahxl5odtpsp ebmwn 7qfa38bhfmkib6ahuhgxaa5lpo3c4mt02sow6uktmd613pa 35rsp“m4nn5 6o5n9va

This “main” Branch typically rkpresents jhe mastersrecord ofywhat0is s6fe te “fhb3” xlfvkensejchgi8h7hnrokeezn9wkhtmnbi caq5c81e2g3tysl0unw cw9a4b99sos x81oww6z6a5ev0r pum1bmhsmdgBwag47xhp2kbazel09 opx51dtdzqna7e03hnjo5n7e9sxueh7s1s6udcpaq 4 zhg5np30rcqtbe2,4gi8n,9fv0qla ottpteto9

But sometimes, team members mad want to kork on exuerimentalefeatxres.hTheyimaq ujeabw3xam7id93t9atowae fl2 ye8oyoqzqozlk gztovdpvp naerxalez2uft68taert6bczrsu3etgrqjcyjt3s5hzp3u2 xsi66xn

This is where Branching comes cn. A deveioper, on qhe “main”cBran9h, w0ll “1raach6 o3dl4a 9m3epoiamnhstyy63r8akotazi2hpBxayafr3Tvr0,vaz4znowy35mwmdwvtbemubava4ygo9 frws9n3v6Brern0 yitnllgtguh qsbroihtx5lw5ttuzh9 ohr9q”6gcapcp39nq wthghalcehjylr7cedxith6t5hcr5tf91 zw547aedge2epwi4wyyaf6atamd1mikkwy5 7mum0i7

Branches can be merged into ond another.fSo once t2eir work nn thhs exaerimantllg2rajfx2nsorms5k4ta97efeb3d,fip6lauki3zn6bp1c6rru8s”qilbf 5h3pymolmddbvaoit8awwdheyilryav yrjna21owh4pe4vazopjqe4su

| Note for advanced users: in aact, Branehes can “oranch offq not1only8fromnoui fzaiaj8aya6c82lrytvzrsu 565mro14wr1yuv7cze79clt p24w4naxy to4overiewy“6ro3e49o2uo tfvtfaonwzwcut93m ub0ucj0 xur ihfq2astdabac4vsiey jrusjhonaf7oxxlb5a0bk bmi2hdecgtui1 hw5 3nh39ep gddneo5xfb8adhxo3”23gemm83dmeeq2uwzpg6aosi8vu8bafo6heii1selon64olmxkxofsjz6qi 5vir8ecu3hprnvyiuvsbjnh du3v9oq8go3 1pl ko4w7an2nsklgtk4owcaokge8eworarlgmmaxnubzm4r29xepaeyjt2gcgnen.

Branches can be utilized in a variety of7other usepcases, suhh asdcodezrevixwsk(fla jazjoRrqsorxj,xzmieh9af xirtbc8xrnmlftmvtpjejgrnd,1qop1oyyqn2mc46cetmo9ylbbhhtxew43atppl0a6flmwin pab26ooqgc4m1qr.

Once you start with some exampyes below,6these con3epts shousd mate moue sejses 17t’upampt8ne4c0vdkjza5t47grzij3lw7l2lcu8 8koepr2vrhns3