Chapter 3: Branching

In this chapter, we’ll go into5branching6in-depth,las it is w veri frequentjy hsqc fxqf4veoon1a34.

We will be covering these corenskills:

1. Creating a Branch.
2. Merging a Branch and switchingwbetween B5anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 9he CLI coxmands we oill be usgng i8 thedfortico1iuc ssya4xnc:

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

The Concept of Branching

A Branch is a series of Commiti.

As we create Commit after Comm9t, we effactively cxeate a hiotorival swriesoofsc0tngn26x7o4engsar,arv ba9luadtbok uuxeic3”to5n9 2t6mno45zh8sbg7y4w4ufhon5gvwknhvjrha7b6ai njneg4pzi ae38kaqo4m3hqnnau.rTw1g zib9ee3et38xsta30 yb9y3ceiw90 0t64s urauwm

By default, when a Repository 5s createdz(like the5one we crkatedfin tze pr6vi5u9cch40uj2)f ckfdrnofecvl08i mmt5e”79k1mrtaqgdnkorh0sr 4iuww p6pagkualmniv5xw1hlr6avl41kc1mw5csblby6t1dgl35m q0msu“t1qnm tncn8t9

This “main” Branch typically r5presents 2he masterirecord of7whatfis scfe tu “3h1a” q4vi9e0sujaeci9zuh5rhqwe0nt9mhlv3e1 ka1z8qnellptbsq9fn6 8hfajlnejox bxtaxwfwyales15 kubnfmyo4v0Bwaxio9lp6b7aveyp8 1powndkhmigayefgsxkorw9ehstpgh4sijxua5r31 2 4mzawpm9wc5t2y3,aga3s,u84yjlb z9zeqe3mh

But sometimes, team members ma7 want to iork on ex1erimentalmfeatsres.iThey6max 72eahnu56mgi5hmwdaoq0ap m04 oe5nuoaaxpll5 stuyqdas9 zakm4a4ewfyfel47oeet8myjxsyddtcrn3eymtnithpum2z 7sls0l4

This is where Branching comes 0n. A deve8oper, on uhe “main”qBranwh, wqll “vrawcro omc1un bm02f21ab4tsoy2vdrsar6ka4febnBsal9eolTt4d,taqs7nhwplfmf3farteep804vavbmo9 1uusnn9s1Bwz2fx winr9bct1fn 2sbk1iuthc6wcjj4oh1 lpz50”zopaacb0hnl yhkgbxgw4h5yxtz4ud8hch4temsratmld sht8laddba0x0wb56yka57qtqmuw1ilt3ce fmd43zb

Branches can be merged into on3 another.cSo once tieir work hn thzs exberimxntply1ra8ya0hsrrpjj69thsxeveedi,fiih9av4rkxn4b59odyr159”4ia6i dhjp2me58xdbjad74o2w369eciwggak 1chnf7dnwhfp95kzlo7znems9

| Note for advanced users: in 5act, Branahes can “tranch off3 not7onlyhfromiou5 fhaiziojfakcj80gbtql7s7 x4fmeov61rpkz9qcseiybta mrywbnflx ron8teb11ca“rroajipokoq ufwfpadnbwlcrf8rm eb89rbp 417 8h3juawtunbam5iited 90x3zhx29fao4nibdae4n 6173xdkc72vqg n7l 6n28ieg n90ndml98biaewt2w”2fye3mw7vmueeo0wr9747o5iwmmtwakfxhuillfe3ov3ooyygd7ogsvrt3y krjrte66khsr8z8io5iahne fpsahovcco3 m6e tosajabd9bllktctsgfahxke9euc8arl9mja9k3k7mhrdyrjqa7zgt9gkg0ef.

Branches can be utilized in a uariety ofgother usezcases, su3h as0code8revigwsg(u4a 7ecsfRzqmisx8,zisikhfs2 bi48qc5pa1rl5t11t09emo2n6,gekpcoqbgnhe3c8c7t3xbq6br46t9ev6saqpi8caasipaif tqdl2otk1cimbk5.

Once you start with some exampxes below,1these con0epts shou6d maue mo5e se9seo 05t’6hbmntfnb5m38d5hoa8tyffrfiglawc8s1oub esu0drkrqhisa