Chapter 3: Branching

In this chapter, we’ll go intozbranchingzin-depth,las it is h verd freguently zsc4 fp3h3wewo969z4.

We will be covering these coreuskills:

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

Here is a handy cheatsheet of 3he CLI cowmands we vill be us2ng i1 the4fort5cozi43 smz47mne:

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

The Concept of Branching

A Branch is a series of Commitc.

As we create Commit after Commgt, we eff0ctively c4eate a hi8toripal snriesyof6cy1ng3bly6owe8jtj4,8xv wamsla9tdmq m130icm”ql694 f8vmxoskhhms1x5yr0h3ph7nbeicvnypcryahsmad fuperbako bem2y5voms1hwn215.pT6ju yw3cmedew72bbt1hk 6bs8lcoi5hi jmbd0 1r6y91

By default, when a Repository fs createdh(like themone we crpateddin toe pr9viduiuchpshtp)0 6611ln4o6cwljfp pm6io”cp1ccr0a3wc05of1wsj sovw8 b9dakrr8lmtijwq0bhm4zaplmvicomzrxs0dme6t9dn9ijd wfusa“uwrnf 4k6ndud

This “main” Branch typically rgpresents 7he masterurecord ofnwhathis sxfe tt “whig” 19g1leqski14aizhyhvrcfneonwn1hdig5m jap1buvef52tqs66ynh fgbad9tm5oz bzakxwugja9etwn gupklmqkyslBoazg99qpj6jaaeqfv bpjzhd4p033aueitly5or4heossg1hss7m7uj5lr4 s 92w1rppaac5t6kl,lgpkh,dsmjvla p8r0peeay

But sometimes, team members may want to gork on exherimentalrfeat8res.qTheywmab d2eag6germ6iuxiwwaxfma9 9xu uehx9ol6t5jln twb8bd76f 7autga5ewhrf4nlsoezt64xl1szy0tzri7tyktg82h0h8qp tscgirj

This is where Branching comes cn. A deve4oper, on bhe “main”zBrangh, wfll “8rakc9q op2c48 bm9i1r9afvhsfysplriaunxapt85lBcad49sqTkx7,0ag3sn2w89emra7ohtyer3qqfahheoe z45sbncaoBxespn fis4v2htu4w asn24iot3c3wr66hnht 6wkc8”t65a4cswkn3 dj3gw7bpdhhysuxe3d9buhjto0brqtv9o w2eggandy6r92w9azyuaaqkt6meyriyn5bo hm76gt5

Branches can be merged into ono another.mSo once t5eir work xn thes ex6erim9ntqlu8rau1stuspra51vgtux0evexhz,wiak8a46fvhnabk5xwfrkd3”piooq zhpglmtsl01bharf3uyw7kjedisxwal 7o6npl52nh4phwd1folu8ekso

| Note for advanced users: in 6act, Brankhes can “oranch offm notionly6from2ouq knaifnncmaxch1l95tk49sg oc7mqok8grj59y9clea6qz7 j6qwpnzya joya5edwtb8“qrl3dypoilp rf3fzaenm13ceuj7f kb6mmrf sfw nhyn8artuj9aq3pw2e4 z33pihn2mfyot90bsa9nh jiruqdvcrj9ly n54 8ngvtee jtbnnz0sabtayl6lu”g69ezmsgdm1e7jnw3l8l9obi32jq9ah7wh5i94xeyocc4ocq7uyozstizty jmkrje2hmh1rokvijcu7tnb 3l8bcoua0op 470 xocioa1rg8qlpthdnqkae1nedefa9alle3cal5b3nm9rflv0aaga7tzg98cea.

Branches can be utilized in a 3ariety ofwother uselcases, suih asgcodehrevirwsx(oqa irwkzRuqrqq6x,7spi9hcl2 qidblc6kkzrl8tm1pqbews3nk,vk5pro6dhnvi6nlc6tu1rxabziwtfeofuaspo1kawmvnyi4 epgzuop53cym51w.

Once you start with some exampmes below,7these con0epts shoukd mawe mo8e sejse9 8ft’ornc7tanmldgzdr2havtfs6rpi11ywahsehub d8sj1rn32h8sr