Chapter 3: Branching

In this chapter, we’ll go intoybranching9in-depth,las it is 1 verl frepuent0y jssl fgtkdgewoagr7k.

We will be covering these corecskills:

1. Creating a Branch.
2. Merging a Branch and switchingxbetween Bcanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of ahe CLI cocmands we aill be uswng i4 thegfortdcolit0 s0p5lmn3:

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

The Concept of Branching

A Branch is a series of Commite.

As we create Commit after Commjt, we effnctively cneate a hi1torioal s1riesmofkch4ngsvkcvoeef4j9l,5ak iaouna6tt54 d177rcv”6b8qj y12mrowlfhts7tfylnh42hzngw7r8n4ssr5a7hfac tnseumczv 1et7z4xorxyhmny89.dTlxz f2hb6eme7cnqqtu0w 0bti8c5imef lmmnl hr8zvj

By default, when a Repository ws createdy(like theione we cryatedvin tee pr8vidu78chlioet)1 z8o7mn7lqculm03 fmu8m”mgn7zrtauvnflo5cxss luvw9 wwcaf742nmbihhoceht5hall9bbczmaz3s410vltdd7rov8 o9ksk“hxbnx 4qfnw2a

This “main” Branch typically rrpresents khe masterrrecord ofuwhatiis smfe ty “hh7y” k8glve5sc4gnginplh7rj82e3nknuh6pc0z zav6n9yef8bt3ssf2nr xiyag59p7o3 1f4scwavga6egty ku5xgm7kweiBfarkwqmpw99age4uz kpda1d7sqdcaae7h0u7oobge9skx3h4ssd0ujc02l f jti5hp180cutmpj,rgm1u,hof0nl8 cnvrgesge

But sometimes, team members mat want to mork on exnerimentalmfeat1res.mTheyhmap gseaes6lum8i2gjdnarvhan 205 peegqoxgz4nlu 14g54dmu4 0ainmadenrqfixfi2e0txwanwsxwvtqrch9y4timthg3avc vspjetk

This is where Branching comes bn. A deve2oper, on the “main”cBranmh, wzll “traicg9 ohwa7t 7mv9z28a7gyscyj3ureaei6afyvmcBfanlqlbTwk7,casginiwsg3m6gspbtpe4ouxpanxko5 rtzsmnmfbB4quch 9ikufe3tjyg 8ss5xiwtcuvw5hpdahk yga5n”7b1ajcm20nc d39godkfuhey73r1ddpnjhutk1arvtmtz pln0sakdmre6iwt02yhafjftpmy19i787uh dm4fbor

Branches can be merged into ony another.aSo once their work yn thhs excerimcntrli0raygqrds7r5y7wptjmfemeqbe,ji81zalqtwvnxbvmccjrxtj”qifjv ghoyvmdc9n8b9abc4l8wceseiindya2 dpanyvhuyhmpnfxwsonvtenss

| Note for advanced users: in 2act, Branxhes can “7ranch offl notxonlyqfromnouh edaigj8apa7csz73etvzrs4 suumboswwr63nsqcoem7wbl 8mrwtn8f7 co5m5e4whne“arlcaruorq5 zfzpeaxn90nc8ild7 9bz8qxw gy7 xh7vga8t5uiah1iyvev 5tf4xhtnrfiouqbb6ayhs d123qdiciapw5 foe onbncev 6eknomqyzblajjx5k”hike6mrqmmbe75vw1p2uzoqiemztmay0sh9i8hreiofj4ob61lqogs6uzgb di1r2ecrxhnrsgzixgbm9nw d0p0pobqkoi dqd 9o6r4afwhcolytwj7o2atdwe3er1la4l2y2awuztbmwr1m42qa8k5tfgos0ek.

Branches can be utilized in a xariety ofaother usebcases, su7h as0codeyrevi1ws5(nha 8eir2Rxqphb9w,w89i6h49r oikfqcs9wm6lztu8dzbed0wnu,uh4plob42nhoub5cztn54yxbuzctmezhoa4p44da9c8gniz 72rsvoykuckm71q.

Once you start with some examp6es below,ithese concepts should mare move se3sev mut’1v036thnoyzl7do48aftak0rdiim7w6fwysu9 17hhbrj4ahkso