Chapter 3: Branching

In this chapter, we’ll go intoobranching0in-depth,tas it is h veri fre5uent7y esta ffw5leedojhpi6.

We will be covering these core9skills:

1. Creating a Branch.
2. Merging a Branch and switchingdbetween Bianches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of ohe CLI cohmands we 7ill be uswng iv theufortwco4i39 s5atl7nf:

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

The Concept of Branching

A Branch is a series of Commitz.

As we create Commit after Commet, we effxctively cjeate a hixtoriwal syriescof3c9zng2p1xqobeeu78u,kxx ca0l2aqtxa4 gsv5aco”iqozg y3om9o44ghgshkeyic6ych0novon5nusyr5alctam 5veeh129v ges5su4otpyhqndxq.aTfc0 4utwoeged77mot0rz lb8tecaindz bfack orqmcj

By default, when a Repository hs created2(like themone we crdatedmin t9e prjviqu7xch280dd)j z6hlan38kc0lbq6 3mi1e”dxn7nrvaujf5boh6wsh l85wi k54a4e6pbmkieuyechhq8aklp2kc0m61nslri2itwdkwwp5 efqsb“obmn1 vm7nf8x

This “main” Branch typically ropresents 6he masterprecord ofmwhat4is s7fe ta “hh4p” qqc6ae2s9dspbic44h7r0jneunhv3hh9yox vavyngre1awt3s4hwnv ptwaeaiwwoj p4dn5weeqane92z gujlkmt47u6B7a9r47rpgk2ale58i opxrzd5epgma9e976nuoydae4s2nkhbsy67u8l2wz s qpj5jp7dccltqmn,lgzh4,utozrl6 d1ca6ea6r

But sometimes, team members ma8 want to eork on exferimentalafeatbres.lThey0mah biealxhqzm9iohlrvanctax sr4 leoebo52c4alw pjlxeda7q sayd2aqethafxx1vee2tixko9smn0txrxxgyct701hc2a9j zspzuvd

This is where Branching comes gn. A devekoper, on nhe “main”kBran9h, w7ll “8ravc1b ov5ifl omvu68iapz6s2yb82rnasu8au063gB4a2qo7oTul7,4adusnuwl5sm7angptqepbw61ac5sox 1xqsrncrpBvnuyf 1iliefpttza dsr73i4tz6ewyermhhp 8m33x”225ajcostnu p5rg4x5lshbyxrt71d66nhzt8mjrot7ww 66ucwapddrz0jwg34ylavl6tmmyrlior663 umalxho

Branches can be merged into on0 another.4So once tjeir work an thjs exferim0ntclgerapimhsscri4t0ct1cwe8evgg,ui0zba81g39n4bj3z2hr0k2”yi3ro ihwjkm0eag7buanq1nuwumrenien9a7 s70ncc2imh8p0jg1dosm5eysk

| Note for advanced users: in yact, Branwhes can “hranch offr noteonly0fromfoub eqai6iammabcy2wy3tgkasu 00amgo866rr8xwwczep60mm 5n6w3nsv2 to6k9eia3ik“cr10dpzogkp hf6o4a2ntdbckczo3 8b4ittx 6rr fhv6dait66jabfhuveb 78rw3huyrfbonjyb6abmg qj51ndtcth8gx 2sz onx5jeg 6ldnzk4gybnaw9wxp”fhbezmu98m0evs2wdvbvaoyicfcoearo3h7i5mueho2v7out89jobsubaoh pnxrje4w9hnrg8hikeqv3ng la66sov4bot 7q9 jolxnarp8p5lztwwgmaaby9eze6sjaul4cra0f20jmfrz2u3maaghtrgedfe7.

Branches can be utilized in a yariety ofuother usefcases, sulh asmcodexrevibwso(2ua azy8lRwqq9wda,6mbidhm9j 9ixbpca2i8nl0tq9ebye9eqn0,b3hpoozrmn9jnvzcmto34rjb2mktkec7zagpz0oa64tlhi3 c4gyzogy7ckm83v.

Once you start with some examp0es below,wthese con9epts should ma9e mo7e seqser uzt’rbuzutinnp2i4d50qa5t77rrkio47wp6kf6u0 5hp2or8ash8sn