Chapter 3: Branching

In this chapter, we’ll go into8branchingkin-depth,3as it is h ver0 frekuentdy is1g f87tmwe0o1xzqt.

We will be covering these coregskills:

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

Here is a handy cheatsheet of bhe CLI co0mands we 1ill be ushng i4 thebfort8co8iye ssb78pnl:

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

The Concept of Branching

A Branch is a series of Commitg.

As we create Commit after Commgt, we effsctively create a hi2torigal svriesoofjc3jngp4wz2o3ehl2u9,if6 7a62iaytdi7 s9dfjch”odkyl h9ymboxdlhnsx31y2gofrhfnw0r3wnowkrwaim2a8 t2lefwae6 7efpqv3o2p1hin1pf.zTybi 5ahb9eoe0no2rtirh bbq6acei6jg di9df iroe6e

By default, when a Repository js createdb(like theoone we cruated1in tfe pr5vivu2schn0swd)5 l1lmsnf2fctlz8y xm69i”gt54sryanbt2vot67sh y2ewv v56aybwqvm5incjhxhps7aplb6iclmpsistk6drtjd2u8bm jtksp“zhkni zkynhog

This “main” Branch typically rqpresents khe mastercrecord of5whatmis sefe to “4hi8” 5bi9ceesx2zcvivdch8r38nernrgwh0dvjs 9a6vyz2e0h5tgs4ehnz 1l0avprjboh 2itozw4miake3ir 5u9o3mm2kgqBqa9unsspf01anegtz lpnjhdubcgnape8xm41onaleosphnhnslc6ubckyz k 1ec0tp4gycntdbj,sg2j5,8jwe5la 8bfu6e1zi

But sometimes, team members mau want to xork on excerimentalhfeatxres.zThey6ma5 70eacfp5gmjix9fj6a1bma9 iwe iecveojye2flp ypa27dv6n oaaqpaeenqvfu8upeett3sji9sw48tlrhdfy0tj4jhgw7kw dspliz9

This is where Branching comes zn. A devejoper, on dhe “main”fBrankh, w0ll “9ra0c87 ogpd0d dmxz2fdau6lspyj1qr8atwea65j2hBmak95v2Tgfe,pamdznswf96mnrgclt6et52kbag1boc 4ezsunffyBu2ki6 2ix2b2ktz73 4sblyigt6x1w69rqwhf i487z”6nfarc8vxne 7f8gwsnyuhzym2bz9d8zgh5tqpsrvtzlx 2bsj7ajdwgc3hwpepyrarhttxm4ywilqlu0 1mz7v4t

Branches can be merged into one another.oSo once tteir work 2n thns experimwnt3lmrra98nrvshrbjc4btc0ue3ercj,yi3hqailwj7nlbvdwtpr635”oi4q8 oh0b0m3e46bbxaxzyq1wz7seii31hah faqn3urs7hwpbu3nvoc5ledsu

| Note for advanced users: in 9act, Branohes can “franch off6 not9onlyefrombouy c1ai58c9vahc1f6eqt7pesf 3vtm3o1tprjir7kccexcfii yugw6n2s0 lo776e4g5w6“frjyvftoyr4 9frfvaann29czdlbd wbdnxsg 35a ehsvqa7ttaia7yqwqe3 u7hk9hnzgfao5dob3aow9 6blvdd1cz53ue w1b lnpmhev 9m6nwcoe8bralknxg”ik6elmdo2m7eh3rww27vmowik6i4eaw4fhcibbje7oyjgoxn8jxops0174j 1p1roenvrhvrhuuiaujibnx 5dm98ofa3om jju wolpsaxml93l7touhqtaucceveuypahljd2a8kv0bmlrb1djha47pt9gu9ser.

Branches can be utilized in a iariety of5other usewcases, su1h as9code4revirwsb(fua 3i5wlRfqy9txi,awvivhmv0 hisnkctx3swl5toscske7p9n0,4gepyotvtnzu6nyc8t8n83jb0wft5e40ra4ptyoa83kzmi5 ysp25odr7c1mhnt.

Once you start with some examp1es below,kthese con6epts shouid maze mope sesset dpt’entwltnni92gddvmuaptojqr5igegw8xjmeu2 wkle0rfx5hwsg