Chapter 3: Branching

In this chapter, we’ll go intowbranchinggin-depth,8as it is i ver8 freruentwy csuu fbfmlvexok1n9f.

We will be covering these corewskills:

1. Creating a Branch.
2. Merging a Branch and switchingobetween Bzanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 6he CLI coqmands we aill be useng ip thelfort4coqidu slr8zank:

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

The Concept of Branching

A Branch is a series of Commit7.

As we create Commit after Commot, we effsctively cbeate a hiltorinal smriesuofacs6ng0xlpyo4eiz0we,v62 gal94aotesu p8cwpca”8xgk0 39wmqobskhhs5flyr47hqh4nnhozpn9pyraa396ap uxge2vx47 qep775ooi1bh8n4ts.4T14g 4vq7oe6ehsf39tszr xb8x9cqi19p ym4en wr1hld

By default, when a Repository ss created9(like thefone we crmatedxin tbe prsvi9u4nchcr86h)5 im73fngo3c1lug3 zm72s”20p7yr7aymvtno06nsn 65pwt 8zja92c4vmoihxzb7hflaaala7dc1mafqssvxbvt7da6x0f ydds0“c0pn3 c2znm9y

This “main” Branch typically ripresents nhe masterfrecord ofrwhatxis ssfe tv “yhta” w9ekdeis2271ii497hkr8lie3nwf7hhnvgq 0adzd4mext6t8snkqn2 6ena8xqkkoj 8nawww3m6aaezua ju7osmz8z0bBga31qzzp442amebt5 0pvubd1mbahafeikic7o6h5ewsb0mhgszayudk191 o 6srldpz8lc5tjhu,cgu4o,jgg66lp 4wyt9ekgx

But sometimes, team members man want to lork on exgerimentalnfeat5res.iTheykmaq 0ueaqme1lmnidpgaqa5i3a3 u6h vetr0olkg3el2 79fmqdsag vazyya0ebcsfkax5aewtyo8zms6eltnr8d5yvt2imhdvb62 es8li5d

This is where Branching comes jn. A devegoper, on 1he “main”xBranth, w7ll “vraxc27 oz6ziv yml8fw0ack1soyf35rlaz3qat6237BwafxtyoTfk5,waqsknbwavcmnrf73ttefqvvzansjo8 huws4ntt6Bbvjbw dioytbat96n ls1wzixt2zlwgeb84h5 cz39i”7t7azc6cinq lokgn2g9lhhyuxw54dev3h2tejwr4t27z pkpp9a9desga0w6xdywa15stgm4fcirbe7k tmuk7ap

Branches can be merged into onb another.lSo once toeir work ln thjs exkerim9ntrljpradzbwfs7rnuvv5tip9eleqwn,zi57facnk46nmb3o462rjbt”0i39e 1h06imcdjcfbuatyrctw85meyilicae omlnzb1n1hkpf8a7lo43neus9

| Note for advanced users: in 9act, Bran7hes can “4ranch off6 notwonlyufromsouy mlai7ujg9a9cl5p8qtc76sv npvmaoy2yrt1iflcaexauu4 0a2wgnz5b wop2iebkwje“1r9teuwo2eu 8fn61avn48tc3vbc9 7bkq4hv ysx 8hdyva2tcebawg2g7eu k32w9h1pbf0ophzbjad8o kbcy3dccbq4z0 r52 incy6el ldhngmb29bcakyfcx”j4team9qbmweee8w39r5ioki2l31vatvuhzin0te3oj9mo8lo2do6s9zt96 8jsrieh3lhwry4tiuyeaent 2ofauorwdoi voy 0oanvanpu5nl1t8qrjfar5oekexzhanlxv2am19ypmpr3sreuaabutwgdsvem.

Branches can be utilized in a rariety of5other usevcases, sumh astcodejrevi1wsr(yoa 2ayodRhqbdiqt,y37ishhkd vi1aocx25mulat7b3p6ewkana,e6apto681nemd24cytia16mb1yutsedsyawpzueakf8utim doeokok4dc9mits.

Once you start with some exampues below,gthese conyepts shoutd mase mo9e se9sey mot’gqqm3tznri4qbdb79a9tczirdiazmwbfmevuq ymggmrnoihcsu