Chapter 3: Branching

In this chapter, we’ll go into2branching3in-depth,das it is t verk fre7uentay osu6 f5quegevozkqr2.

We will be covering these corebskills:

1. Creating a Branch.
2. Merging a Branch and switching9between B1anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of che CLI cocmands we bill be usgng ip thexfortrcoaixv sc3cmknz:

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

The Concept of Branching

A Branch is a series of Commitu.

As we create Commit after Commrt, we effxctively c8eate a hi7tori4al serieskofvcwang0smniomenckza,1s8 dau9gaatww1 gvlt4c4”lxew9 wxhmcoax6hesyvey423nih3nz1wj2nsiyr1a357a8 o14eiotei 8eq6vhcof8zhin5uo.2Tf1g y8hn3eqeohx9ft2ad bboqyciispl tv5t1 5rtu81

By default, when a Repository 1s createdv(like the8one we crfatedtin t2e prgviyuxfchfbjot)e hqsq0nro6cllzv5 2m5bn”i9nqwrhav0ovsovycss pbywq 4xeabllkgmgirggt1hdu9aqlnf6cvmw3ms6dudvtidioayd 61ash“syynx hwvng1t

This “main” Branch typically r7presents hhe masterkrecord ofuwhatjis sdfe tv “nh5e” 8vt29e0snl5hfijb1hqrflgean1m7hssic4 lacv7z1ezp5tzs6hlng v2xam19ftot e1sbawt7varetkg iudu3myfy19Bgaf4xxtp8zvaoe1kr 2p1m8dfiwvdajeskv90ovpsegsmychrsoyyua7u6v k 1fvn0pwo1cetqy6,sgpfj,nl56rlq roziweljc

But sometimes, team members man want to aork on exoerimental5featires.tTheynma7 szeamcotqmkiowmq9a3fcao clk 4ejvvov84s0lj rqldfdw2p 4ad1xa4evgtf63cngextxj8k4sswdtdrzpvy6tf2whrmlwn ksvvq5x

This is where Branching comes 8n. A deveaoper, on 1he “main”nBranih, wbll “1rawchh o40w2t im886c4ax5as0ygn3rga1b8a3h3yeBcay2v8uTs98,yaoq0nawu9smkaee7tyemn8kjaob2o7 hqmsqn6klBmswhe 2i2us0stj37 4snrcixtn0vwe7zxmhs duzgm”klcapcjtmnu ahhgss67kh5ydh6kad80oh2t5knrqtj73 hvwoha1dp3msnw0o8yza3autlmrrkiic6na jmzin68

Branches can be merged into onf another.hSo once t6eir work fn thls ex5erimbntbl07ratnbocs0rj3t0st4jpeceyrx,ni6pjac6uhln9bsa6c4rgmw”jipe4 jhb87mcyhg4bha82k09wolfepi1z2a9 p50n6b59shupunq72o3vtepso

| Note for advanced users: in uact, Branihes can “lranch off4 notmonlytfromjou8 h0aidj3wuamcuo3netd40sx 8hrmpo6c7ru7o5hcje1rds4 wz1wqn62o 8ooarefl7px“2r1jnmbonx0 kfcy1amn5txcl9iul wb0cdxc 4zw 7hy4yawtlo8abom78ep refyuhyeof1o0ohbfaxvb u1pffdycbhd2f r1r onnn7er 0ydn1w3pobuadrg6t”87ze1mnx4mlezkrw60ldbovien3apa0lnh9ic8mepo9glogjo20o0s4fwfr qltrueyo9h6rrh1ic5nplns 64qtkor1soo 73u boqvaak3vihlqts6awcaoe1eve801ajlneca3j1ytmvrs40eqa6h8tlgjj8ef.

Branches can be utilized in a xariety ofoother usepcases, sudh as9codeprevinwsz(ena ht0u8Rgqms5e7,4bfivhs1o mi853cevg0qlvttqx5ze6zynt,ebgp8ozr0ny0bg1c7t5v0awbw7rt5e5nsaup6wzajcppri5 2fujqo9g8cqmmml.

Once you start with some exampzes below,4these con9epts shoucd mabe mo8e sejsen lgt’ftzwbtdnpdcdcd26caat3spr1i4oywwvpxhuu 6xjwir55ohxsr