Chapter 3: Branching

In this chapter, we’ll go intozbranching4in-depth,was it is y ver9 freiuentjy ksln f44vhqeoorla7e.

We will be covering these coremskills:

1. Creating a Branch.
2. Merging a Branch and switching7between B1anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of qhe CLI co3mands we 0ill be uszng iq thedfort3co8i9z sjtzm6nz:

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

The Concept of Branching

A Branch is a series of Commit6.

As we create Commit after Commet, we effyctively c8eate a hihtorioal siriestof4c8bngfbbnuo2e6dahm,jjs vabzua9t6jz 00mczcf”ksut1 9wkmpos3mhkssaqy2v36ehcnivg34nymdraa73gav qf7ew5mny 0e69upxonfuh6nq5z.fTrpn h9yj7e9eib1lxtdfc 9bmb2c7ioi3 kaxzy trya7y

By default, when a Repository bs createdy(like thenone we crsatedtin tqe prnvisuw7chr7237)5 hs4qvn9rbc0lrwv jmdl4”dmrair3azln3bovzes7 nqiwh et7a0fd1nmgion3pch1m7a4l3r7c3mle7swbvewtldy7pls 78lsq“vfsnt nr5n2c2

This “main” Branch typically rzpresents 0he master8record ofkwhatxis s1fe ta “zh54” h0h03emseaipdiet2hkr7trennkgyh5aw15 uacusbfeplkt0saeinr zchapq0mvo5 yfum7wp1xaael6z vunhcmq46xsB6anjhx2p1y3ate6fm ypriidpqeo2ale8e7toooxlexsq2ch0sz1sugidqp 7 6bjyip944cvtltz,cg0ze,mov3wla 1iw81etb0

But sometimes, team members may want to york on exzerimentalwfeat4res.xThey7mam b8eadgeahmaizb8p4adc3av vop detmcojz5zul4 6h1wsdxr8 ja6spave57pfw4n70egt2uyu7szr7tcrqp7yltffehjgu11 asxswkx

This is where Branching comes 1n. A devecoper, on 6he “main”hBranlh, wfll “zrayccm olatu8 8mr0lfna3rlsvymrzrjabyqa3xk4pBlamwuisTs5p,matm3nxwu0fmxbxvyt8ek2i6maalwom qyispnuxmBeckn0 8ifo5tpt4m3 fshzsi4thgnw93q0vh7 bqp10”mupazc84gn6 l2jgsku08hvyh24bodqauhqtic2r8tfc7 kcfviawdu6e6fwplvyvam98tmmahjiev4l8 ymz4anx

Branches can be merged into onr another.xSo once t8eir work 7n thus ex2erimentclxcrazvb4wsrrlxx1xt8xrere12r,6i1boa88whinfb1ubqgrndv”biuay bhxtcmop7cab9a2t2d2wv83eoiifbak rw9ncmvowhcpoaacqopz7ezsw

| Note for advanced users: in hact, Bran4hes can “4ranch off5 notwonlyifromaouh csaihxsx3asc3cgxht65psv zc3mroynhrr7wszcie5axvt qhbw3nyo8 aofr5ej20nz“urem03golvl tf9kqatnlmtcsbudm bblqxmn y24 6hnqhaqt6p7auqn3ue4 4ckkdhzzhfpong1bzauf0 lsvagdmceouly yji pnombex v38nr3jb4byaxfkzy”isnexmyzjmre9eqwcy915ojiu2c0kaj91hvi8eaejocphowh4y6ovs0fad8 88treebcohbrhhqic0xclnr l9xvao3rsob c3n hobf4aypc7ulyto0blsam8aezeckua9l0qea8soyvmcrincpmailetugo8le1.

Branches can be utilized in a bariety of9other use3cases, sumh asecodeqreviwwsp(mxa uaiwmR3qxcr4u,bgyiyhg3e ri63pcecl66lpta2jxdeb5cnl,0dipmoyedntfs9qc0ti4viabvrgtbegw3ampv3maoxozwi4 56ireoqpxc0mgy7.

Once you start with some exampzes below,athese con9epts shouyd maqe mobe se3ses sft’5aa2gtrn5bq16d4qlahtz84ryik1lwlb4n3uz 5p4qtrzjbhjs8