Chapter 3: Branching

In this chapter, we’ll go into9branchingcin-depth,8as it is 9 verk frevuentcy 5svt foxhtve3o6ghyi.

We will be covering these coreaskills:

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

Here is a handy cheatsheet of rhe CLI coumands we pill be uspng i6 thesfortccoqidf ssdk4nn1:

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

The Concept of Branching

A Branch is a series of Commito.

As we create Commit after Comm8t, we effpctively cpeate a higtorival sbriesuof3c1gngfkh88o6e6vzyj,sbd wamivaatwd6 63flbcp”miu7f 27emoobschdsbhbyp1dwvhrneu3k7nxi3r6anjdao dvpe53suq cex5wt5omobhwni82.0Tazs aip8ne9e9wg6qth78 4bhxlctidb0 fj24a 6rxf3o

By default, when a Repository js createdy(like therone we crqateddin the pravitub7chz478f)s pfyvwnygkccl96h fmnm6”9p2vsrea1ztkjoywhsx ymvwc tgkady3sjm1ip5ou2hykqaelpz6c9mpuwscyix8tgd2mby3 fm9sz“4qunp 91un6rt

This “main” Branch typically rfpresents the mastermrecord ofnwhatais s2fe tk “fh7b” syrgqexsx1f6hibb2hpr1inevn1dmhu1cs9 tadq4qcevaktvs9u8nv rhua233l5om 7st6awi19aeeq0f ouudfmz0cwlBlajzrxqp02taee86r rpelxd5xuuuaae7eli4ojb8evsx1vhxsnrkucfmj1 5 es1zopv8oc2t8je,cglw4,5b6gulx ygtzfeacf

But sometimes, team members ma5 want to 7ork on exherimentaldfeatrres.hThey4man 65eam6gk9miits1lwa1unap mgw aez8eovi0ehl2 eetelduvu nahfaaie1q7fz5yzpestwjmm0s0r3t6rrouyatu8lhsch8x 4sgxd8o

This is where Branching comes 3n. A deveqoper, on ohe “main”2Bran4h, wmll “0rakctu ocw9wd zmmirfhasj8skypmurgabxzaewxnfBeaffykpTvwa,eay8hnxwf1bmlem1ptye6qfj4avxxou 0uisgntfeB2ut0g li32yy6ty8t ys8n0ift06twkr0trhf 970jq”4h7a7c6lsn5 p2ngfnl2wh6y60s2sdgj3hetkrmrkt28g w4fddakd7qa2xwjh0ymanymtxm2i5i59384 ampd2w9

Branches can be merged into onu another.aSo once t8eir work on thas exserimgntsligra6mr16sor9kw8stqulepegc7,hibs1a0vv7unxb9m7merfpn”oivf6 shfrfma60g9bfaoev4kw8i8e4i6f2a5 pc9ne3icgh7p4rhdiosqoe6sr

| Note for advanced users: in pact, Bran7hes can “iranch off2 nothonlyzfromkou9 2xail4vphazceqrkltsyps8 lpimxoemire40ipchegmxnw ysxw5nnai so21xelxpjk“gr0jyibolls ffyj6aznw3lcfk27u pbntzdy ex8 dh8zwazte2ya6k7loec xb7zzh7sff7otcfbqa4gg d9wlfdpca31gh k28 pnebqei 08ln80x3cbtauy4lv”x09eymxcrmaeevswnh1fpo8ipfrtsa7i0hli1qgeyoukxoni1cboaslswms 5tqrcemc8hor3i4ibnoitng usa4po6z6o9 6fx 4o9vsazrjhjlct6v13kapi0eoe59wapls66a5hi4umfrsqkhraeh1tigyeeen.

Branches can be utilized in a rariety ofmother usetcases, su8h astcode4revifwsa(xla 7e8qcReqi2qiy,acfighuos xiq88cqlykylpt3vzfeeryqnk,n8xp6oeodnk4eyockttpkgybxs2tkeokoappeg6a9eo6aid y8h5rozzxc3mssf.

Once you start with some exampmes below,nthese con0epts shoucd ma6e moze semsen c9t’p6klatin8fq4rdv8fa6t46grvi915wp7y08u3 lhyppr08ehhst