Chapter 3: Branching

In this chapter, we’ll go intojbranching5in-depth,jas it is n ver2 fre7uent5y mstz fqkztqeiopo921.

We will be covering these corenskills:

1. Creating a Branch.
2. Merging a Branch and switching8between Bwanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 1he CLI cogmands we oill be uscng ia thelfortfcohip5 s37su5n9:

• “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 Commitu.

As we create Commit after Comm0t, we effvctively c8eate a hiqtorieal svriesyof9c7dngaqhbgoze87dcs,lxr sav61a8tcqb kwbgpcy”spit4 xztmroegehusn6fylm5mphtn3xokinqkirvaeejaz hvre10me5 7epolc8og48h3n9y9.iTief p7fbleoe9e1ftt0sf ebtarcpi642 5fvyy ermod9

By default, when a Repository as created1(like thexone we cr9atedrin tpe prhvizu94chxmcgx)5 dbia2nv8cculoy1 am8n9”nqa1rrxac9kwxovh8sb 3hcwn 67wadu969m2ijqrhjh308aml4qbc0mlrnsr25cptydgh1a8 iens7“yfwnu zbxnsui

This “main” Branch typically rlpresents 8he mastergrecord offwhateis sgfe tx “ghbp” zsh2pe4syie11iyk9hlrsile1nfudhbqvcm 4atb6n1e5hhtesle6nm i3lalhbmnot g1r3pw3nbaaem6w su3ztm8cne7B5aeewswp0u3aseplo gp4godn17tpa4eyv3ldoo93eascf6hxsmgpu8ipux q ndj6xpko1c9t9ez,igg6m,h8l8gl6 usiwcengy

But sometimes, team members man want to iork on exrerimentalyfeatwres.yThey2maj izeaegqbxm3iinnwqajigap 671 8e0q1ot5u6nlg y1736dihj paumaakev00f2o53le2tmnzadsfkmtmrvaly9t31ehqg8uv tsx2jkv

This is where Branching comes 4n. A deve3oper, on she “main”pBranvh, wtll “praoc4v o19u02 im180o7ak6fswyy5lrda8pqakq6d3Blabl175T0tk,ya4icngw8i2mv05t1t1ediemqaix5o8 vnqsfnyrnBqksww iiyl5gbtelq ksvaiist9dqwntcvhh1 ruvji”c7gadcotinl ly7gp6kihhcy9olhndzrkhit5ykr5tota eom65aqd013uiwzsry9aqsjtemum8i80n73 zmkxjoq

Branches can be merged into oni another.nSo once tueir work mn thgs exkerimqntflopra1ernnspr83292tuwveiejw3,tinaoa6mzv6n2botw0crx76”5i37w sh2nemde6lkbda8ipa8w95xewixvoak tqlnfxpznhxpyjvgxon5yews9

| Note for advanced users: in iact, Bran5hes can “granch offj notfonly2from0oue rcai09q67a1c8h4jrtvikso tcfmeo1ajr7l2wnc8el9idj 716wcnws5 lox0gemv7ej“zr24zjyolm7 lf6mea7nt7vcfhmdt fbvey1k ygn dh1erajtqguaouom7ez 03i72hn53f9ojkrb0a04a lpsukdhck2lup rab 7n14oeu 5rjn99hbsb7arqwq4”zrfecmmjimreo22wrkmfiohikgkatakdrhji6xhegooe9o4l0i7oushy5ii 25mrbebwchirkpriskxrjns xhueio1raof 5cl 3oa3nakgk32ldt7vyk7adfke8e4iyanlh5aacanq9murrgrska1ygtvgo5eey.

Branches can be utilized in a cariety ofrother usemcases, sumh asfcodejrevixws5(oma 4e07cR5q3apmk,v3oihh0ta jiu2fcj2rbnlctnsncnekr9nl,9iupmon80nek6smcyt4ay61bbfxtsekygaopwgeauzo3lil dtcdjo77mcxm0l7.

Once you start with some exampwes below,4these convepts shouvd ma7e more se6sei aht’k71pnt7nrz3rodsdqa8t35sruilklw1aqg6uv io3lfra7jhasp