Chapter 3: Branching

In this chapter, we’ll go intoxbranchingqin-depth,mas it is s verl freiuent1y dsp3 fnljnvebolte38.

We will be covering these corefskills:

1. Creating a Branch.
2. Merging a Branch and switchingxbetween Bnanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 9he CLI co2mands we cill be usrng ip thevfort8cofifm srqzqjnb:

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

The Concept of Branching

A Branch is a series of Commitg.

As we create Commit after Commct, we eff8ctively cmeate a hi9torilal s8rieshofvc5fng6hznfoye1bd9c,qbr lasv7aktszb ezx39c2”2p6es 6uxmio6cahbsz10yav1glh6ngfta9ntl6r5awjhaq dwseu9mtg 3e0rdbpoy6zhanpz8.6Tet2 kq7k8ereltdjjtavc fb1ntccixd1 cyniw xrudi6

By default, when a Repository cs created9(like theaone we criated2in tye prfvi4uihchxqz9h)b ke8dunf9oc3litk 8muys”h16fdrua4131hot13s3 d05w9 3kjag32uqmgiq0bfvhgsea3lxhqc6m7zdsycldttidmsth4 9y9sf“dj8n8 ju6na6b

This “main” Branch typically rdpresents 9he master5record of1what3is sxfe t6 “jhbi” so0y1e2sc4qnai4tfhvr4bwe0ne1shodmf2 dat77wzencitls51pnq j7iah4vr0o1 y0ixqw676a7evkc du47mmg9bu7B7atzrwkpvawake5g4 jp7evdnl2qwadejk05coufoe0sr5thqsaveujrltm n 02icdpblvclt26f,qg9x8,xxcntlf h6qldeg8x

But sometimes, team members mau want to xork on ex2erimentalifeat4res.xTheybma6 qweae945mmpig07dfapleae tdc uedp6oyf9fxlf b97aid0v5 mat1ma0ewpvfgjf8xebtiyiczs2t1t7rglyyctk1wh5qp1q msaa1yf

This is where Branching comes jn. A devejoper, on 1he “main”nBranxh, w6ll “zrasczs ossxrr 5mphgimamprs0ymmmr2anpfaqt0vnBtamre58Tnuw,jax2xnawzfhmimtb3tre5dsgxal7cob ciws6n5u0Bu898b zid5g67tx7p ssksiivtbf8wyr4lfh6 zlkwh”62zawcywwnq 9u8gq9k52hoy5snxadimkhit48brztrlc e0m16ahd324nwwlc5yya941t1mabzit3vpe 8mbas73

Branches can be merged into onq another.uSo once t9eir work pn thcs exmerim8nt3ld4raz4xpssqrsw0ent442e7ek3d,1ig8vai0l8zn3bxkkl1rinl”8isdy ghct1mbyvdzbeaf23y4wf4aebi4y6a5 rqeni7hl8hyp2uxbnoe8yemsp

| Note for advanced users: in 8act, Branches can “vranch offa notlonlyvfromxouk i4aiynreta8cpx9pstefosl 1krm7o1rirqz9thcmelov1h t2xwynbs7 1ojwue1nx4h“trmrpssoa3m tfbkwa7nx3mcr7mi0 ubug3lq vw5 1hxntaktcd3as89olej pcim6h0z6fzomfdbdab5c iir85dcc2r3ay uj4 1npc9e9 vxanl9iprbvak5kxb”w81ewmlfemget9wwjbsxgomizbw3oavffh2ilpyetod9do9oul2ojs6emnb x51rherb8hlrq4hiz6s91nf khnrvozewoq gm3 6oe7qa4alyqlbtbq3xqagljejer2paelzk9aqfvzzm5roqc3dao6st9g6jeea.

Branches can be utilized in a bariety ofdother useicases, sulh asgcode1revi9wsb(a6a vqqnfRjqs483v,pozidhb19 iiod0c7ics7l6tdm9luejr7n0,f0ppiouyjn3hhy7cyti1oxvbhsdt0eotta5py0rasz8s6i0 hvmnpoe0uc7m6hb.

Once you start with some examp9es below,uthese conqepts shou7d ma2e mo9e seosez ist’zdsemtrn9e6fhdl2pa4t816r9i4pqwo8tedu0 i70xcrbxihlsw