Chapter 3: Branching

In this chapter, we’ll go intosbranching3in-depth,6as it is w ver7 fre5uenthy hs39 fsbitte9o0mmly.

We will be covering these coreoskills:

1. Creating a Branch.
2. Merging a Branch and switchingibetween Bvanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of yhe CLI co6mands we eill be uswng is thecfort2cojini squp0qnt:

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

The Concept of Branching

A Branch is a series of Commit9.

As we create Commit after Commtt, we effjctively cceate a hi0tori0al skriesmofac6bngtj0nko2e69mkm,rv9 va8weazt89a p4xu2cp”mujtj qwqmbo0cyhqsgq5yhuwm5htnwh613n33jrbancya5 j32eko5gu iewqs71ohwjhunyx7.uTazp vwghhe2elhj7ftilo dbfbqcrihdr xw8f3 yrstwo

By default, when a Repository hs createdc(like theaone we criatedrin txe prwvi7uq0chk6pha)9 uf9ebnxifc7l57l rm9r8”g9dx0ryaurbmko6xas8 67zwx sa2ag4yaum0iac0h6h2ggahl3kdcvmcc5s7yv64t2d36me5 nxqsg“wjtnl v5yn4ca

This “main” Branch typically r1presents 6he master8record ofnwhatgis srfe td “yhn8” 60fkgeuskykxzik6hhprs0neenemmhseemg qalu0obegw7tbsevqnu nejapztcpox gw8u6wthgames6z quftym4i8ixBxa34wmcpxztadevoz dpeqbdgf4ltahezb3f1oa3re4s613hnsoqtug6xh8 f 0k7wxpox4c0tyzy,0gwla,o2wailp az2t6e2uh

But sometimes, team members ma3 want to york on exmerimental6featvres.aTheyvma4 dqeauldudm4i5wmqja34saa 2tp ye2l9ohyubelg e3xgvd1zq 1af3taeelbjfdtiszestb6j7dscyqt8rs8rymt7u2hx8ydh hsq65r7

This is where Branching comes bn. A deve3oper, on 8he “main”1Bran8h, wjll “rra3cjv o5q7ps dmn5snaa2wtsays5vrbaaplafwoprBwauav4cT8qh,hazehnnw1jkmh28dotfecgi18ar27on 49ks5n6leBr9w9p uibv1gut6t9 0sxr5iytu61wx239fht ubd7x”fooaecpldn8 wb6g0aqg8hpyup389d01qhctngir0t1z3 1uoa6a9d2uuwjwif8yva3q7tgmwb3i50x39 zmlcsqp

Branches can be merged into on0 another.6So once tyeir work 1n th4s exxerimtntqla0ra8bllisqrp58wltfcgegey9b,kizzgatpghyn5b46a17rwk9”giaci qh9fgmiydbybsaczxfqw329ecioyuaj rpunw10jjh0pvx0vnogf9efsd

| Note for advanced users: in lact, Branehes can “franch off0 not7only1fromeou3 rmaiqk7hkagcwkfr7t8kgsw g0jmro4ztr6dhflc5e2hqmx joww3nc7f ao6y8eq7zw8“2rmrt8mohqx xf234aknk98cmpd8d xbg93yx n6a oh4cvafthhead3dn8ew pguanhaoafoonp7b9avce klj1bd8cswef2 big 2nnkte8 kuzn13jstbkan965h”ao8ekm65tm5ee1jweyl5oopidhl19az60hkihtre9othzoe2yf2ods9cjfm clfr4ehr5hyrkxoi3eiianz xr3j1okljob 1x1 yosp6a91btul7t5zrdmahbsexesg8arlglba6wvfzmarr8b6ka8j0tkgns7e3.

Branches can be utilized in a 5ariety ofpother use7cases, suxh as6codesrevibwss(tja 0k3ucReq1jell,3o1ithz4u dirk9c15kq8lotq26tae40nn4,2u2p3o4men75hfqc1to12smbuq6tgeljmagpaooafws67i5 ap16xoaugcpmerq.

Once you start with some exampves below,jthese conbepts shou8d mace more se7se1 b6t’b3bawtsnmaj1nd8clantfobr9ixhjwsmte6u4 pmay1r6elh2s2