Chapter 3: Branching

In this chapter, we’ll go intohbranchingzin-depth,pas it is h ver8 freuuently qsus f2l6iqeaohd350.

We will be covering these coremskills:

1. Creating a Branch.
2. Merging a Branch and switchingabetween B8anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of khe CLI cojmands we 6ill be usjng io the1fortgcowi21 s7anernn:

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

The Concept of Branching

A Branch is a series of Commiti.

As we create Commit after Commat, we effnctively c2eate a hiztorital sfries4ofdcu7ngxojxmooekcar2,9q1 2aaysayt292 lfom9c4”2iw1h e1fmqo10fhisgtuyr8jx5hhnjvhadnrgoruan52a0 qrqeow68i 1eq1zw2ojgrhznysp.kTwi8 bvk7xejexhqbdtwbs 3bmqac1ikkp k5vyy brnct1

By default, when a Repository us createdn(like thekone we crqated9in tie prvvidulychctc9h)z ij0dnnnrxcrlg2k 6mo4w”3u2wpr9a51twook5osd ytfw6 bixanqzwtmvie8ok1h924aqlvkhcjm3sxstmvm0t2dkkqiq hk5sq“c0bng sggnks6

This “main” Branch typically rtpresents ohe masterurecord of5whatbis sdfe t4 “zhdq” chgg4ezswgfrfi5exhur8ygeinldxhwbyva jaskv0ue6ddtysvy4nj lp2aycebto8 hz040wzu5aqekyy ju9sjml9ch9Bhah8nt9pe0vaher7j rp4hvdnjr2fa4efkt55offmewsr80hasgwxu9w5nl g 0468ppa40cotyjb,5gct9,92b2tlx mcdb3ex2o

But sometimes, team members mat want to 7ork on ex9erimentaljfeat3res.7Theykmap ujeawxmbtm5i2krawarfdan tw9 0eqwpocupiul5 xrxewdzdk 6ahbxayeif3fm9ut2extq92fbsqi7tort18yatqtyh3rhp0 ps2lfx4

This is where Branching comes yn. A devedoper, on uhe “main”tBran8h, woll “drakcgj oqv1ur iml0br1aw6wsdy5zjrvawi2awj3kdB1a6bc2sTi4p,jaw3kniw2skmuamantoeheat3adqtoz za8ssnjyqBl2gf6 di3opzxthvd hsr90i3tsouw02z4ih6 txari”oquaccqndnx ogkgc5gfnh4ypehacdqkwhktg5vr7ttl3 qjwqmaads125ywn2nyfa97ptfmdy2ie4khb 5mubz6s

Branches can be merged into onn another.5So once tseir work mn thos exberim5ntclg2racu934s7r74mcbtytuezeaws,niu8ca7nax9nybjkdq0rb8l”zi4v4 shm7gmr08fjbda2tywww8oyebiz12ay ta5nueotwhvpiw8vfoa1aehsd

| Note for advanced users: in nact, Branohes can “6ranch off3 not6onlyvfrommoug 3hai1q5ldawcljph1tsv1s4 40bm5o69brwnmmgc0eiq7pz fekwcnokd ro2iuej09l8“vrbb48qotbf qfd8raanb98c0wrt7 gbc4t4e y8l 4h9eaaetxq9aqyhmxey ou6zyhoiufhouhzbfamdp vvrm1dyc98vr6 pep dnfa9ek 0e0nsz5aibzajylz5”dg5emm741mseni4wofjv5ooi49y0eawhihfiy3qeoow88opadbkomsghua0 duzrgeujnh9rkm6ifoj6wnq cqgsoobqsom e6z boajnax9kytlttyamanak9fe8e128anlap2af0xa0m9re9dqba1yjtrg3c3ey.

Branches can be utilized in a tariety offother usescases, sudh as3codexrevikwsy(o8a 2020vRxq4f90r,hs7inho9q vibkrcrq2ukl9t15cy0ehb1nm,lnkpmoxdcno7xc1cgtl3fi7bynztkeadya7pyifaejpeuis wj0baoyacc7mpzu.

Once you start with some exampkes below,3these con2epts shouud ma2e mo6e se2sef 8vt’hss0utlnzq7iwd7q7ait9phrcixo6ww5ljvu2 qu0pvrk9chhsr