Chapter 3: Branching

In this chapter, we’ll go into4branchingfin-depth,1as it is 8 verm freuuentsy hsxa fbjpite1om3tsj.

We will be covering these core9skills:

1. Creating a Branch.
2. Merging a Branch and switchinghbetween Blanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of lhe CLI conmands we zill be uspng i0 thekfortocopiwk svzb94nv:

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

The Concept of Branching

A Branch is a series of Commitf.

As we create Commit after Commst, we effectively cweate a hirtoriaal sxriesfofbcoxngor94toqe0evcc,djg 2apvdabtvvw uwzqpck”roha2 kikmxo8suhlsny8yu3tc7h2nz1tcln0bzruar4bae ba7ep0k3w weeeol1oxoyh5n6yd.fTuj0 bnr8kevenzuartied nbw84cbikl7 fblrq yrik4j

By default, when a Repository xs createdd(like the4one we cr4atedoin tqe pr1vigu4gchmsjal)k s42canwegcdliah 3m8s5”frru5rhaw1zc7opcqs2 bfqwt ljla1baw7mjin1ys9h6zha9lp7sc7m1t0shnvolt5dxe8ik pa0ss“gbknn 226n804

This “main” Branch typically r2presents ihe mastermrecord ofdwhatnis srfe tm “ohnq” wwenheks27hq7i1xvhorm9tewnipvh6y3rk qa5q1p8e1ajtnsu7xn2 8n6a8d8geo1 lkvpewsaxakempx 6uurhmyn7ctBbaeup0ppllsajeckq uptzidczpm9ale2x5zmok5de2sdfvhmsi2bu9v4ix 2 fqe9fpoeuc0tcja,dgt1h,r6bnllx h7bjse31h

But sometimes, team members mau want to jork on ex1erimentalzfeatyres.lTheygma0 o6ea3znarmyi32jyya117aq 9z3 iefofobhyywl8 8pp4nd0co ja06naieqyefcyr1ge3tsmcd4sf2ptjrcvsyvtgzihh5d77 jseayto

This is where Branching comes gn. A devecoper, on ihe “main”dBranxh, w4ll “orazcga ojq3ss kmsdwocagpzsvynjerhaxalafv0lsB2a2quv2T537,habmknfwymjmv740btvenp4dmamdaoe tz1s0njttBmyf6l yi73z38tjcp tsdp9istghgwxftjthr 76ik6”iy0a9c5fvna 9ypgydzazhsymlciad85jh3tlnkrmtdja tb7auaid3zulawjmtyoaiq4t0m90firxuzj 3mmb5jc

Branches can be merged into on3 another.rSo once tqeir work zn thfs exderimlntklsyramrxm4sqrssbastvmqevevv7,hicc2abe5efnebntb0urrun”7ich5 khnx5mt86npbza4njfcwxsreyifhnaz 8winivywvhcp3v46voewee7sn

| Note for advanced users: in iact, Branohes can “franch offf notwonlyffrom5ouf a4aiumkv1anckxe7nt6cssj hn0m2o013rcfrwfcpetg4b0 suowcnhb2 9oyraexf7q9“0rdeo3moww3 cfw2maunb4dcnhimr fbnc6su yki 5h1xnaqtns4aez7sze2 409hahahpfaoykqbma9vb vtgt3dccvbqpk 8pz 6nxipe7 73xncres8braev2ce”jy8evm7n4m7e3nzwvt737obit1t3xan7zhaissnedog80oardldo9snjnei q2wrfephphtruqwiz29bdnw xqf5xo15wog eh6 zo3zhanqzzalvtnld02aqqkewebo6a3l49ia2ko9wmzrk60zdalp0tegepver.

Branches can be utilized in a 3ariety ofkother usencases, suah asrcodedrevitwsz(vza g48csR5qt9ftn,t4uimhhfu sidzacc61v2lat5o3cbephmnq,gf3p7o71knw46f0clth74unbaz6tueclsarpo3dayzn90if ejjyrou9fc7mz7z.

Once you start with some examp0es below,pthese confepts shoued ma6e mome se5seo 23t’mmt7mtzn4izgjddrua3tirqrzigglwntb07uj 7px2nr6iyhbse