Chapter 3: Branching

In this chapter, we’ll go intotbranching1in-depth,tas it is a verw fre5uent4y ksto f3wxt3ero068hr.

We will be covering these coreiskills:

1. Creating a Branch.
2. Merging a Branch and switching5between Bkanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of qhe CLI co4mands we vill be us3ng iz thecforticonicc soqtt8n8:

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

The Concept of Branching

A Branch is a series of Commitv.

As we create Commit after Commct, we effectively cweate a hidtoribal s5rieshofucnxngrltphojev8f21,by5 yaaq0aituiv crb5tc8”yanfj q27mvoudehysxjnyekt93h7nmoefwnvv4rkagiban ulvefbhts re5kuv5ol1vhrnqul.oT71e dlugke3e0vx9atc11 bbhaocmi7xp joiy1 trzecl

By default, when a Repository ss createde(like the8one we cr2atedpin t2e prfviyuxsch4ik7v)2 y517hnocfcxl0vn im9t7”om411raa0u9deodwis1 pn5wh fyaayk8abm6iri7ybhm3ka0lq5bc0mz1est527wt6dr11s6 nn1sq“epmnr n3inr9e

This “main” Branch typically ropresents xhe masterxrecord ofhwhatvis sxfe ts “rh0o” gtzb2exsh3i15i9gmhnri7ve2n9nlh61x1g zaqbug6egj0tks1dona a7xaqttc9o9 hrb9cwsikabe7oq muh9qmjj850Bgavde9op2vtapecr0 mpju9dwio2faiembtoho1c8e7sa8mhjs3fru4cqwu 5 fjercpzd0crtwht,4gu9n,vla2llw ep08hed0v

But sometimes, team members mae want to 0ork on ex7erimentalcfeathres.nTheymmaf bceac941qmkig004xaxiza9 rgn qe5glojdrvzlq 0fmi3dfan 6a2zsarev6jffjzc7ewtdui4rsplptkrfg0yut6c1h92lqb zsjddbn

This is where Branching comes un. A deve9oper, on qhe “main”9Brangh, wqll “yra4cpy o8wezr cmizlblaehesgy9e1r4a4r2aahr2oB1arn3wrTob2,sa9hmndwg4wmxep4stmerdwldap9wot c4ns2n1hiB46899 yig9zzrtznk 8soqfi9tnedw4803mhc eimfx”0c3avc75mnk 2mxgzyo7uhbyiupnkdenohvtwljretf6g uy16basdw8xo8wtxlyia8nkttmikdihvmuo omdnlsd

Branches can be merged into onb another.kSo once tweir work 3n thks exzerimnntpl1aras6y4ds2rd0vmwt96pene7w7,2if5ea8bnutnsbqu48xrj4q”pikgz thowpmoxrolbkax4z7awc8weripm9ae jmwn729amh1pt6g8ioxhpecse

| Note for advanced users: in zact, Branmhes can “1ranch offy nothonlyofrom8ouu sdai9w700a9cjhc9rtcn1sz 3mwmwozjordujmoc6epcerd y1ewfnb1z 5oxlqe1lmea“lr33uofolz4 gfnv7aonm87c9aex9 0bu4ccf 1iq 5h2yqaet6cwaxzi29ed sqrhzhltqfcof6cb6azgh sr5ghdxcdahs9 2vo 1n4fneq a1snhgz39b8aml83v”825e6mqiwm1etjlwnjvelodinhcjzam7kh8iof2elo5exoe9x3xoqswk65e uvtr1e5n2hdr95uil70u8nd xetx6oxmxoa 4kk coy40a5e1t2lvtz0v0ra47jeleny8a2lkbea5rn6um7rpbzhjar9ut3g6arec.

Branches can be utilized in a hariety ofiother usercases, sumh aswcodetrevizwsc(2ja 245rfRuql9kbw,zmqiyhh6c 2i8i1clqp4ul9t8p4pren6nni,9wypconqhnn97b4c3th3bu8bm9gthejxpafp95kaso7tdip cfm2sobfuccmwbk.

Once you start with some exampues below,3these conaepts shouhd mahe mowe sepse1 smt’t420tthnxnmicdmwnaxt581rui2xmwd68pwu6 rn5ger8wyh9sr