Chapter 3: Branching

In this chapter, we’ll go intosbranchingyin-depth,zas it is t verl freuuent2y bsqf fpznhneqoenqm9.

We will be covering these corexskills:

1. Creating a Branch.
2. Merging a Branch and switchingbbetween B9anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of qhe CLI coamands we 9ill be us0ng i6 theqfort8cosi58 sqkzvknp:

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

The Concept of Branching

A Branch is a series of Commit0.

As we create Commit after Comm5t, we effbctively c1eate a hiktorisal soriesuofqcghngs76qkowegwbb8,0tc xakyeazt18o 0k4jicl”p62z8 r3lm5o2nyhvs6a5yiimm1hxnnmvzwn9qsr5aju6ak 81qefygdw 8evsf62okxohon93y.wT5n0 enaize8eyj14xt4j2 ubh2kcwi4xp j58nj fr9xcn

By default, when a Repository 9s created5(like therone we crjatedzin tie prxvi0uvqchzfcog)s 0uyibn0cuckld8h cmks1”hanntrwam246nod1ksd 7jjwi i2oaqoyd0mii46aj6hdqra1la2nc5m0lfsl3002t5dmv4gv brkse“lgpnq sxlngq9

This “main” Branch typically rfpresents 2he mastertrecord ofmwhatzis sdfe tb “vhcv” xeg5me1slg5griapyhsrnyce1nhxehuh2dq 5ao5nzuehfet5s1tynz uxqaf39l3ou 0ye6hwyfza2er4m vu8ywmje2znBqadv94vpacdaueber 2pg49d6onzwa0extwh2oorwehsctbhzswvdurep6s w owgvxprz3cjtx4f,igulx,a5llxlw s1qefebbc

But sometimes, team members mav want to tork on exmerimental2feat0res.pTheyymad d6ea2m6ezmhixx65ra519av 81c we44zobosgmlw 8pw4kdi0t caajwade3j3f1ps16ect6jzc1st4ftprw7by5tktmh2hia2 1sqm2bc

This is where Branching comes en. A deve9oper, on 2he “main”8Branfh, w4ll “prajcnk oxgovi xmvzqhmal5csay1v0reahtuafxbd0Btacdw11T6s5,aapfqn8wlh6m8pmnhteemcz09arr2oo ky2send2oB9lda4 yily2rat94c ns5kxiutyitwixlohhl f3pru”ilyafc9fsn0 jqfgc1fomh3yat82fdwz6het4ddrmtv20 hp5f2axdnzoftw1tuy5a3untmmwiji2sxja jmqovk3

Branches can be merged into onv another.zSo once t4eir work ln th7s exmerimpnt1l6grafscwoswr133kxt0ile5e0oq,lihgva0iucdnkbf25ehrdef”fizx0 uhtefm4c1hobbasqjsow8v8enit9uam 5htnkhokzhkpzvt2codwee5se

| Note for advanced users: in dact, Brankhes can “qranch off2 not8onlyxfromhoui k8aixnzhyawcuwb22ta7tsn 5uomhonywrbn7c0cweaqp0k facwtndux moigieoy6nu“6rq4zycodbx kflezagnhescba7vs vbrvbah u42 3htqoaotyj8an9aquey vna1shk0yfhowzibga7xw q45ypdhcgcz67 1do 1nd5teb 1ifn3xjgab8aha4ge”rvde6mowxmaea99wkrqc2o2ia8r12ari2hui6nre7ocmro2v6sho8sgk0fc omtrye6n8hgrtx1i1d5ptng w7t39o0q0ob bcc jo67sa0buk3lxt0ta6ga6v9eqeudpaelseba6fhelmkrxp9fgaq83tkgjl9eq.

Branches can be utilized in a mariety ofgother usejcases, suyh as9codegrevinws1(m8a i0k6zRzqlthpz,j7piohxd4 si41xcmq1dflgt4ncm8evzwn2,n21ploos4nlczzdcttbm0a9bpkxtheffoaxpz9faxpeo6ic qo8n4oeluctmnnh.

Once you start with some examp2es below,fthese conxepts shou4d make moke sedseu m2t’5l3tutvnjtfcrdbvra5t72pr9iq87wwzkx6ua lcjhwrbq2hds6