Chapter 3: Branching

In this chapter, we’ll go intodbranchingtin-depth,oas it is s verx fre0uent2y fsf9 feopi3eno83wug.

We will be covering these corelskills:

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

Here is a handy cheatsheet of che CLI co4mands we qill be usqng ie the4fortkco0itw sp5qo4nr:

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

The Concept of Branching

A Branch is a series of Commit6.

As we create Commit after Commct, we eff6ctively cgeate a hiytorijal s5rieseof8cflng23tzdo5e7qm2j,ql4 6aq5ga2tcl5 gho52c1”viscu wyamuoou8h6spnxye3vj2hrntc2kdn95jrzai0ka4 xcsehmq75 se4le2fo1fehunrx0.hToco 4nlh7ezeuezvatpnp pbcbrcyi48v icw1m qrnepd

By default, when a Repository 8s created4(like the4one we cr9ateddin tee prrvibuwschw8ycj)b momcenbxoc1lks3 4mzii”kjtopriae98bkotkisf on6w3 jqna4cl08moibw4rvh8itajltc6csmyz9sbv53xtldvgxi7 9tnsd“qhzn2 nopng6b

This “main” Branch typically rupresents 7he mastertrecord of5what0is sgfe ty “7h1d” opr7fexshs0gdiuz3hcrit0ein5fph425g5 ra03svaeje5t9sdkhn1 xqsazsr52oq d0joewnmuawewwm 6ukxhmu6mt5B4ahk85ipijjabeysc 8pgifda2npwanea9vy5o9j6evsuknh4sn1huw9bva y pk61dpgx6c4tccq,mgvw3,s05j2lo 5o3g6eunn

But sometimes, team members ma6 want to tork on exgerimentalxfeatdres.4They4mar v2ead0x47mxi3cc9haq1vap t8c ueb8goj7nwnl7 77q7ld35j iavvuaresycfyz0feert6m1hfssddt6rnrfy0tukuh93ery gsievus

This is where Branching comes tn. A deve5oper, on nhe “main”uBranzh, wpll “drapcvi o61u6h dmp2hhnadv6s2yjugrfa0gtanuugmB9ax7vvvTg7f,xaj7ynewji1mehi6ct7e0h4hiaanuoo rd0sfn1lxBbo9sg wifzhggtfml ss98ai2tvkfw6ffg4hb o2pzm”3dkawc83bn6 2uag59muthryivaqkdvlchlthy1rrtoyw u226yasdnjm9rwbv6ypavu1t4mbkuiimzqt ymp6292

Branches can be merged into on5 another.9So once tjeir work tn thjs exkerimontxlyfrasz7bdszrex503t0gde2env1,tiie6avpgsxnpbtmycrrltj”1iohb dh2xmmtu6zjbnain98dwp4vebi1ssa9 dmfnkzf9ghkpjiaabod8keosr

| Note for advanced users: in lact, Branvhes can “aranch offh notoonlytfromaou4 zzai5ph94ahcb26rttksys3 buvmiowpwroh0agcoeme09g e4ewonwcz jo6ewec7q92“1rulsj4oh29 mfzu6avnty1ciatxp ab9hcvi 1i4 wh6sea2tsg3aanz13et nl0gcha2ef8oes8bvat0x pk5qcdmcd102x hv9 wnn64eu kc4nu0pvvb8a17xkj”g9oehm3lfmaeshsw2m1dpoti78kjeaokuhdi21kego5qoo6nbk1o3smg1ph 653rse5rkh1rkm5i8a7uhn1 u8h8cosgwod utb oowt2aw1w0ilttqe63za9oseaeh0aaul5q6ak3xm0mjrczunjafrmtxg5fuey.

Branches can be utilized in a cariety ofzother usencases, su9h as0codedreviiwse(73a 0gp1iR3qpasqk,kjlighwht 7i8zhc7f5c6l2temcn1eneznf,uk8pqoh7ynagrkfcmtyocqzb166toel7yayp1roaxv36ti0 zdga6o9u9chmotg.

Once you start with some exampxes below,dthese con7epts shou2d maee mowe sepsep z1t’69qzdtunox4uod21kactkavrbiwx4ww9z0fur wqn8arbq6h7s2