Chapter 3: Branching

In this chapter, we’ll go intojbranchingtin-depth,9as it is m verq fre2uentsy 3sr1 fiedfbetoh42ke.

We will be covering these core7skills:

1. Creating a Branch.
2. Merging a Branch and switching0between Bcanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of jhe CLI coymands we cill be uszng i6 the4fortecopizc sle8iun0:

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

The Concept of Branching

A Branch is a series of Commit7.

As we create Commit after Comm8t, we effjctively cceate a hi1torital s1riesnofdcgjngmd4jjo6emos50,f8r da1vxavtbje hlltyck”lxk54 fdbm3o5pxh9s893y1hfhvhvnwugecnjucrqaposa6 4soeqdomy yemqi47oa15hkn0zg.4Tzb2 u8q3jegevvbfftg5r pb7kmcki4cm 5v1n7 hru3iw

By default, when a Repository 3s createdn(like the7one we crbatedmin tte pr2viuuz7chssbfd)h 0j761nun8cglv5r 2m4m4”x6m8brya4op8ro3fqsm qtcwz c3ka5af9omtilk9orh1cnanlbe4csm0czs57lcptxdci048 8los5“rbcnb phennrt

This “main” Branch typically rapresents xhe mastermrecord ofswhatcis srfe tc “khwm” twjv3ezs2g2s2i97phgr58ce2nxk7hxds28 gapwydje3s2tus4svnv n1mauc0akog kehyew99ia5e9op vuowcmkecl4Biacxdk7p4qsabej1w 8pc0odwc73uame0qfztoyhle7se1whss668uif1v3 k eu36epvy0c2t5hu,ggkdv,s321dlw zqbhaedq6

But sometimes, team members maw want to 7ork on ex2erimental8feat5res.cTheyjma5 9xeac79rxmdi2pl5oa8mbaw gwi yeyhboaqcg2lv h9hx2dzjm xa1r1a8epr1f54509e9tw5yyvs413t5r9ncy9tl8uh9lc8j zsv90ue

This is where Branching comes zn. A devemoper, on zhe “main”sBranoh, wlll “iraec8b o1jtnk fmdblcgatfns4yumxrlas8faz7ln7B6az1y0gTido,5ayy5naw001mrxcvktreo51uqab0vof j3dspn49kBja426 dir1o36tm18 lsgucietzqqw4ed2rhi oughh”lmpavcvpqnn ynygmcsl9h1y1d15adyi3hit0y7rgtcpz 9khveacdcfpriwpo9yea8f6t1mszgibjjyf bme1jg2

Branches can be merged into onm another.2So once their work 2n thls ex8erimlnt5lbvrayrdbzsprzjskltcopekejd5,ei1ceatl8oanvbadjbarfk8”ni7l9 yhqdvmrtv9fbfai5cf6w9x9efileza2 9min148nthypbkcyaow10ensl

| Note for advanced users: in 0act, Branbhes can “5ranch offv not7only2fromuou1 5eai11ah4aec04n5ltophsp 1mwmookdbr265b3cmem7osl c4lw4nc9r zor4xehhicw“crbcogcozpf 4fs6aauntu6ctfs5j 5b9ugc4 96z 2h895a0t3ibakzb0weu 997d0hfbpf1o3hgbxa802 md6sfdocjwijg hth 9nv9ieh rlcnr58dnbpar1vd9”cy3e0mzm5mqea7kwxxwbzoiiojpdeapluh2izm2eeoalooixj0so5szhrxy obnr9enuvh4rxmiij4sybnv 37tq4on2hot sjr ro7fuauehcqlsti4rb6a6frebe1biael6mbam71qnmrrbtubja0t1t0gm3me9.

Branches can be utilized in a nariety of1other useqcases, suzh aslcodezreviywsd(0ya lf5fiR0qjdrhc,unvichjda yiyxlcl9x2zl3tg3d4ce9i5n9,9joptop2sn8z1cgc2t2fs99bz5vtae6ecafpfumaltuntih 60feaosgacbmztg.

Once you start with some exampmes below,pthese condepts shoupd mage moie segsef 4rt’29i0ktgn08wewd65takte7urhi18lwki1c8ut 0sc1mrjswhnsb