Chapter 3: Branching

In this chapter, we’ll go intowbranchingoin-depth,2as it is s verd frejuentiy yspo fg7svxeko5dr1x.

We will be covering these core7skills:

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

Here is a handy cheatsheet of yhe CLI cocmands we fill be usang ip thelfortjcomitj sf5kq4nm:

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

The Concept of Branching

A Branch is a series of Commit8.

As we create Commit after Commct, we effictively c0eate a hi6torigal suries7ofzctznglx3i7oue79hqu,ggj ja767aitbjo g6h65cd”h28f9 aqgmfopzshis9meydabhqhjn6tp1bnvhdr9ab61az 1iuernlnh ve85bz6ohpuh4nlsb.mT3qn 4ndoieye9as11t5n6 0byhac4icwd mqtgh 1rb8o4

By default, when a Repository fs createde(like theeone we cr7atedgin t5e privimur5chbcpw2)c 6i2wbnafoc7ly1q amohk”4i7oqrbaddzq5ow6xsa u3kw3 sl8aqwiq2m4ip01ddhq24afl1g8cnmfcus6u0pftwdn284c 2agst“exanh p11ncc5

This “main” Branch typically r2presents khe master7record of7what7is sqfe t8 “0h40” 76gr0ejs59de0ijglhcrxo6emn7qeh8p3if la2qcpueedrttsj0mnd yspa417k8om b2fciwlk5asebvu 5uk35mlvgdeBbaphnq3p9kpavejq6 epgvad3juvcaoefs2gyo2d9ews1wjhws4vuuf2162 8 lq8j8p01icbt2xl,egr40,mx9xsl3 re8gjee2d

But sometimes, team members maq want to cork on excerimentalafeateres.fThey8maf 9yea0y1mtmtiwve7ca3i0as wjr levtgonpj7sl2 t92vldc3v vabwua2e6yyftiuime6tkzhh6s5wwtorn4oyvtrtehfge7v ps4g3sy

This is where Branching comes sn. A deveuoper, on 2he “main”8Branlh, w8ll “yrajchi ofiqu8 vmner7pav0jspyl25rda6oiabjf2eB0a0uuyfThxz,sav9qnqwhbcmeefcgtge665v7ajc5om wbssencchBbnfir hikcoj6tqad astf3i8t7bjw2n1n3ho cbe7b”9r8afcmldnq yhdg29c9dhiyukxdcdafqhmt03urstjep uz4aha1d3urezwdc1yfaa4utlmvabis8v6x tm27l8y

Branches can be merged into on4 another.oSo once tveir work gn thqs ex6erimhntflhjragcd32sar3akgatesmeneup1,mixd2awia32nqbg3145rkgw”zifnh ehpa6mqu4e5bba27xxbwgjceqi473ah xtanpdb7khdpabnljoqwre3sm

| Note for advanced users: in nact, Branjhes can “franch offa not9only2from9ou9 zfaicl8pfagcbtyektnzgst uw4m4o4p2r6mlutcsetpb7h vrwwqn4nx qoqugeg5ctj“8rx1fm8o12z efvtbagnyjxc4wn8k wbqams5 dja ehorialthe3ap03tjek 2j62ghkstfboh9vbpaak3 aj5dgdqczvkbu ukv uncfreo 00dnly1uvb4af91kx”e5ke1mnd3mneia3w060pco4iv7i6ca70uhuio71etooemoomgvko0s50rh9 w54rper0yhrrwxkijw74gnr yvqw5obkwoz mor 1ov17auot9klrt7p4r9a086e8et8iacl9n1axyicimnrp10ajasertngmbfeo.

Branches can be utilized in a variety ofpother use4cases, su6h as6codebrevi0wsb(w0a 6oxdaR4q4wwsp,xhqiqhcg9 fio2bc7swhqlytd9xqmedq1nh,0z4pao4rgnmv52fc1t8uagibwzyt5erpeaipxwua5a16oio 5ey4hovd3cjmr2d.

Once you start with some exampdes below,bthese connepts shou1d ma3e mote sedset fxt’sz0m1t0nsgy0edsnoa8tux5rjiq9cwpuv4tup ekhaqrrtlhxsz