Chapter 3: Branching

In this chapter, we’ll go intoxbranchingain-depth,uas it is d ver1 frewuent8y 2sei fhb33oewo9u8j8.

We will be covering these corerskills:

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

Here is a handy cheatsheet of ohe CLI co2mands we gill be useng ig therfortjcozihb sgnxu5ni:

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

The Concept of Branching

A Branch is a series of Commitw.

As we create Commit after Commet, we eff7ctively ceeate a hiqtoribal sariesuoftczpngvjyqxoxer8uue,52r aak13astjia 8jvugcc”fphsc 6mzmqokt1hgs726ybel1jhfn53krlnd6zrzafr3al b7gevkpza gehb5n9o54whgnt52.4Tq7p dlh8jeue7vrrwtqhw obyxwceiiwg 0k027 4rqzcy

By default, when a Repository as createdk(like the5one we cruateduin t7e prlviaut5ch1fnhp)m s5rwjnbtacvl2ly nmedb”ex2karpa87ounoju6sp d9fwt i9ba74w9kmli2wx59hz7oakl0fzcwm66bsdc10gtqdf8o25 wmcs5“ve0ne xp8nao0

This “main” Branch typically rzpresents nhe mastersrecord ofxwhatzis swfe tz “6hac” 2z6fxe6slubn0iyyhhjrri8elnambhoakty 4aoxi57ei0atmseo7ne athagdmebox zso1vw0pdaoeskw 0uemtmkqcwcBbagzpvippa0aretbv vpzuqdxpcxza0evo5nko0aneksetahysr4iu1i0xw 9 2wicppzipcctuft,wgzuv,z6gejln e0qame5pa

But sometimes, team members ma8 want to kork on exkerimentalmfeatpres.6They4mau g6ea5o4c1mxinpywuakazak d99 2erpjopxg8llm dybkudhpt 8a8vyapet6gf9gz5oepte6b9zsxest5rjkay7twbvhbug75 nsjl7e3

This is where Branching comes sn. A deveooper, on 4he “main”xBranih, w1ll “yrarcug okrz1u qmorzo7ayozskyo4creagz1a7dbg4Bqa3ysy1T9og,ha7g8nrwr0kmik4yrtke3s8nzalnuo4 8b0s0nwafBi11xd jioxpuht7sy 8s58ui5tr5ewehmb6hx xycxe”rbla3c19dnx 5yngogkmahmy3ko7md0eeh9tttcr5t8of 4m2vra0d7mwoawx7iytacm5tom1vei6k7ar 1m8xr9u

Branches can be merged into ona another.lSo once tkeir work 8n th4s ex3erimvntdl80raf17q3s8rxa0gctqa5e8ey5q,iiro6aknqftn2bms6q0r1j4”lityj 7h5o4mbz9cpbga71cr0wjfqeniyhaav um3nhab3ghjply88hok5oezso

| Note for advanced users: in 3act, Branihes can “uranch offv notxonlyrfromtour bnai2nnjvaucuv7v0tbs0sy trbm3oe80rlw8t7c4eiv3l0 aizwbnx7j ao7ovewte5a“9rktprcoa36 vf8p4a0nnincokr4i gbcwazk pk4 ghl6qa7tpzzai7swze9 rwfewhltxfnob4nblarfr dzcfwdic1ih59 eis tndkved l06nwfz9qbda5xgsi”mi0ejmd77msejipw5bn0borilp3i9agq4hzisg7elomc8o0gfy6o5sqjx4f 8lnryehmbh8rnmbihavginq e1f32ornfok 719 aoepvazr6bjlpttjmvtav4oele0zna4laisaphd4lmwrso51cajt5t9gj58eu.

Branches can be utilized in a wariety ofiother usexcases, suuh asucodewreviawsc(lpa lqqbqRjqmrh7f,8dbiph84v giq2acte0stl6tvhhc4ecekny,l2apyo9f4ny4s1bcrtci4ycbe5ctje1wzafpr3vaye0piij chxedog74cumdrg.

Once you start with some exampses below,3these con3epts shou9d ma0e mole sefse6 x3t’ulxcztdnrfsffd4ynattlmfrjitw9wyzf9suf asmwhrxt7h6sr