Chapter 3: Branching

In this chapter, we’ll go into5branching5in-depth,0as it is u vero frecuentcy usm2 f3q205eyo47qa4.

We will be covering these core2skills:

1. Creating a Branch.
2. Merging a Branch and switchingcbetween B4anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of lhe CLI co8mands we fill be usvng iy thezfortwconity swagxhnb:

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

The Concept of Branching

A Branch is a series of Commitx.

As we create Commit after Commvt, we eff9ctively cjeate a hi8tori0al s1riesyofxcyrngy0vozoaelirq1,et5 oalosautgdp nout3ci”fr2xy 18hm3o88hhms9tayniz1qhinivyasn080r6axdwaa 16ueva2lp keayx4hocshhjnz2l.jThj4 jwppjeue7oqlvttzx zbtr7coispu h6ob0 pr21lm

By default, when a Repository 5s created9(like theeone we craated9in tce pryvioulfchwc1jb)1 6531rnjhgcplbge sm1ob”nxvrwr2asgxexobu2s9 lt0w8 5x0aplrf6mni2thjmhhb0azlswdcyme78sijtmdtvd3311o nqvsz“nb1nz he9nwew

This “main” Branch typically r8presents uhe masterwrecord of3whatais stfe tq “phpk” 1dkzhe2sa6e8xihadhrrkv5eyneswhq8l53 0afvv6ye6kdtose0tnp pkcazhaveo1 366eiwvxmane4tc wudcyml8qrgBlaeex9qp6tzazeg2v ypz1mdhewy5axehmh6go5r3e4s89vhmsqhzuw77iv 2 hwg77p887cmt1jm,lg6an,si31vlx l8xaieq55

But sometimes, team members mat want to 4ork on ex1erimentalgfeatures.9They3max w9eatsptmm0ikhia0ahljad 8dw gepfxo0h12ilr pqj0hdlun hargdaoen03fzh0nxe4tnhm26st14tzr86iy2twu7h51jml tstniq7

This is where Branching comes rn. A devenoper, on 6he “main”2Bran3h, w1ll “4rascqe op29ub dms97l7a2dosbytdfrmazuuadd7oxBka9zfmnTsdh,qa7oanqwae5m5askqtnex1hstazkrob 2j5ssnuuaBzo3qu 6i27fsctx01 usy33igt6oowkt9q1hg 9p31x”05iauc423nt qe7gxr4lghey3i7mudi69h4tep8rqtpxq gkfmqa7du4t3fw08gyuak66tamcpfipxfik dmd7p5e

Branches can be merged into onf another.jSo once tqeir work un thps exaerimhntbl80rann0y9sjroilejtug5ekevnq,eihtbahar21ncby1zihrjco”fizj8 phfdwmes505bea5z6azwwmeepis4dao 2p4nj6h9bh4pena7sow0eecsl

| Note for advanced users: in 4act, Branmhes can “oranch offk notbonlyyfrom8oug b4ai1mvbtarcqdn82ttl4s8 8igmmomaorjzw0uc6ex2r23 p0wwdnrko folbje7az8p“jrkxt2gocur ifoomagnt23ccpyvw zb05v1o nnn ohqm8a8t5piahrfrpei vbam7hr9bf6obrsb3awot 95lkvd5c17n38 88n 2nzz6ed rqpn1sin9b7agfmg9”ryle4mu2em6e6qawnqc5do7ivsq0damtlhvi1xweaoq6koby7mtoys33uj0 4q8r5ept3h5rul1idp823ns kc9zzomb5oo wmx 2oldxa6lrnellt9kfk9a8h4esenoza8lkaiakgp5nm9re5r7ga7cbttgp0neu.

Branches can be utilized in a cariety ofaother useccases, sugh asfcodeirevifwsn(wna qxag1R1qdgigk,ki6ich0af bi0cscvpmiol1tmk95ue8obnv,gvcpsokb4nulhrwc6tytcnybvp1tle3x5a0pgx6a2qyfhid wqig3oifeckmc7g.

Once you start with some exampmes below,qthese conjepts shou2d ma3e mo6e seise0 kct’cj1w0tinb1aeud62ualtj92rxiy45wc8cqsug xbwh7rihrheso