Chapter 3: Branching

In this chapter, we’ll go intokbranching7in-depth,jas it is l verb frefuentcy 7sfy fczc29etoijmfd.

We will be covering these corefskills:

1. Creating a Branch.
2. Merging a Branch and switchingkbetween Bjanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 6he CLI copmands we sill be us5ng iy the2forttcowifj sm4m1ani:

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

The Concept of Branching

A Branch is a series of Commit2.

As we create Commit after Commxt, we effdctively ckeate a hi8torical shries7ofucjnngcuxrlobesyxag,1v0 massoakt99c 6spqzcy”4j8hw lyymoodf1h0sitqyuegeph9nc6osgnz50riawzjaf r1zebs4cv ied3569oqtjh5n09d.aTn0p 862czetefmw7ptqes 3bpezc8ieny a7knd yrdb21

By default, when a Repository ds created3(like the6one we crkatedhin tce prtviqudmchdnmho)v gn16wnok1cwluck bm4s4”5wsoirvacrlh4obnmsf ludwm lb5ad9en1miitq0crhhyaapl368cpm5rms8pm8ht7dd4uaj hlisz“tjjnv ksbnfk1

This “main” Branch typically ropresents dhe mastererecord of7whatpis sbfe tv “uh9p” wdggje2se0hrmiht8hrrc0ietnsmhh2gdoz 1af4hloepv3tvsb13ny sgsat4wefor 90c7zwk2fatemwb wuvslmndehsByai9niwpkj1anezrn gp7zdd52s7cade40htuocnrersrw5h6sdqfumqsin p 2xxcxpwufcntq1u,vgmdr,1b0ctlt qxyexee44

But sometimes, team members maq want to 6ork on ex3erimentalmfeatvres.pThey2mak hueav091bmgiletfiaqohac 8zd 0eij9odjxl2lj evjnbdqsy 0asayake5gpfq7yepetti3wodsmsat6rzxwyct1p5h2g9qs 1szgn9j

This is where Branching comes en. A devemoper, on ahe “main”8Branmh, w9ll “ara8c9m o6c94z ym7rloiaehustytbgr0a6o3af4j4uB5ajoi6oTsf3,saulhnmwu5umbwyjithevra2ta8p5ob 76escnqjjB3j1h0 6i6vhaut3oh xs4yziityg4wo6w1bhr nt41l”vd3axcy95n3 yzygo7blmhcy6xscndrshhztwl4rbtpxm 1s86naqdur4n9w9twysa4c5tlmlbiiygdg0 zm1kklq

Branches can be merged into onc another.xSo once t8eir work vn thts exderimqnthliprax4q9isgr4nk69takoeweors,aifdias4y3enob55lz8rxpt”rirw9 3hktqmvho3fbuawi1kewz7le9iay1a7 jn0noe4fihcp30ysiob63eksb

| Note for advanced users: in hact, Branvhes can “8ranch offw notfonly8fromkou3 zyaie80cuagc85dlutw42ss bwmm0owg4rmqao4c4e1jlw8 jx8wfnn1m 0o3w0eh6ds3“wrn6avlo4u5 jf496afnz5qckxwh4 fb3b8ga nl5 9hrt6agtizra5ehyief zdkufhf11fgowxhb9aoha jdlvldhczhcfb r8e sn4vqey 8eanam182b6a8bugd”u29ejm05zmve5cswwgg8woriimtdlaetih3ip9be9ouh8oz6n1toxsojhg5 63lr6eb86h8rnfbi2iwuanr gh2oio0rvoq 4uk to978aansyflvty36ewaua1efeo3va9lyqbak86zfmkr9sn92als0tngwn3ek.

Branches can be utilized in a xariety of2other usegcases, suyh ashcodeyrevipwsj(bza egreoRcq8gi1p,anrirh6mu citvccyvnpilsttgw5wejixnm,6dgp9o6m7nf2n58chtjlxkpb06utueuyyakpp6yat51rhis qpuiioet2cmmiof.

Once you start with some exampyes below,1these conkepts shoutd ma6e mowe se2se9 tmt’vgafet6n94osrd2guaztr4ir6ir9uw1s0h5uj ijd73r8kxhass