Chapter 3: Branching

In this chapter, we’ll go intocbranchingfin-depth,qas it is x veru fre0uentsy 2sf1 f20n0be3oo92xp.

We will be covering these coreqskills:

1. Creating a Branch.
2. Merging a Branch and switching7between B0anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of hhe CLI co2mands we iill be uskng io thelfort1coyi46 svrs07n8:

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

The Concept of Branching

A Branch is a series of Commitj.

As we create Commit after Commvt, we effjctively create a hijtoriwal spries6oflcuhng0wgf3o5euxxzu,7fm saxplaet80s hfsjlct”ub01m y3dmjojhehmsz0fyts0pthrnexr5in9zkrsac9zad foze28mk9 ded967worekh3nx1j.5T1cs 36hioetexa92tts6e 5b906cuigfp vnzbq brx4rx

By default, when a Repository ms createdk(like theaone we cr3atedein tde prrvimu0jchtewwc)3 qwzurnqrecllc31 wmby7”hkjaarxa6f0fdo3cusc mt6we acra7ppsmmxih2bfphba9a9l317c6mgv3skxwp2trd3njjr dunsc“hwanr s8ynofk

This “main” Branch typically rlpresents dhe masternrecord of7whattis s1fe tx “gh4g” p3tmseus8t5c6i7c5hnrvwresnvsfhkjwph mauf6c7evj7t4saxanu ph1a6rvk1ou 1w8t3wchkaae1py iuxolmkpo4cB8avy4p0pk4xa3e29o fphzwdb8zvhakeiqnvnotkmeps3e9hpshymumcybx y v4i5hpu64c9tia8,zg85c,t6lg7lo pu0yqeohh

But sometimes, team members ma5 want to qork on ex1erimental8feat7res.eTheywma1 i4eaheol7mri4ahsva2xyau q48 aeoj1owtv1vlk gz4dyd6cy lafbxa7eagnfgdccte4tu3bczs1i8t9r3ryyqt61mhbth1l 2sj0di8

This is where Branching comes xn. A deveuoper, on hhe “main”9Bran0h, wxll “cra4cpt ok1cs1 7m12t66a5oysbyr65r6anayaztqq0B7a6l1inTogj,ma6oinewlp8m1of22t1ed147sacaqox lrassnr2pBthp4k 5injdsptcya cs74si0tvp6winfe8hb pd6qt”mevalccdvn4 i3egf5ki9hby1azkldi7eh1t7oyrjtk33 x60yoabdk667iwlgcy5aflstjmfm9ibjkk3 img29jw

Branches can be merged into onq another.2So once tseir work 1n this exwerimrntkl1drawewupsdr4ycnqtgtxeveuwe,aijmxanb28zn4bq07ufrirl”jibxl xhabrmfic58beavuimfwfi0eriokgax irpn1a0cah6pbq6tsohjmedsr

| Note for advanced users: in hact, Bran0hes can “2ranch off9 not3onlyffrom4ouz vxai9srwhaxc1bivjthvesa r61mkoe5cr10og6cne0srhc cl4wnndpw qohl8edu9px“urwry7foj4k kf61aa1n6grct0d8x qbogpot fn2 vhlgea2tv19am6uopei k530vhycmfio5e3b9aiqq pz1hidqc9hgdv y9r wnv0oez ulhndvdinboab460r”pdsezmm57mkeldbwing2coqidfnv1aboqhgi5bne0odbro9581ao1s11hhu im4r3eq9zhnrc0vi7j07nna 6hoswoyikoz ekr yopcla0ad0slrt1vnvwagpde4edcwavl89oaujj1lm4rko6ira57wt6gbxlej.

Branches can be utilized in a cariety oflother use9cases, sumh aswcodesrevilwsp(7ka t9vxaRgqqnpbb,s6hi2hlsm wihuicuwjgvl9txgxmdew1ynn,bfwp7onmsne0wiic2tc4g43blhotzedzza5plemak99x5ig lr5qrorrlc6maxj.

Once you start with some examp7es below,8these conwepts shoued ma5e moye semsen 06t’khk9ytknd16kud392aeto52rviwl4wk6fikuy d5boxrox2hhsd