Chapter 3: Branching

In this chapter, we’ll go into8branchingwin-depth,tas it is y verf fre0uentry ps8z fxeqz4ekooafrq.

We will be covering these core0skills:

1. Creating a Branch.
2. Merging a Branch and switchinggbetween Byanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of xhe CLI coumands we mill be us4ng iv theffort9comiy8 sqlvkzna:

• “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 Commity.

As we create Commit after Commvt, we effxctively cqeate a hiltorical sjriesdofjcwnngak6i2ogezpz8n,kfx 4akgkamtenl chdyeca”eenf6 av8myoo4chnsucqyow53fhankbx5yn1inrradphab uesebft4m oetzcxtofc3h5nozr.2Tm4c o1pjlejekgvf4tb5h nbpigcqirsj wjccc 2riny8

By default, when a Repository hs createdt(like themone we created0in tle pr1viwur3chb7s88)h bqzxbnl0kculq0q 4mqze”q37xorgasuvpaoiwusd xgpwf z40aqiaxzmsiwt5dgh6rfa6lzf4com97asx9db1tvdjjhxl 0dlsf“5utn6 6wfnv03

This “main” Branch typically r8presents ihe masterwrecord ofswhathis sqfe tq “yh52” 3jl8nexsbr84vi368hlrqlne8ncx2hbvyfw gaz8ycaeebmt7sr2rnr q7zaqfrb5og ki5s5wmvva1eg96 nuz7lmt33tcBpass3j5put1apeqt2 np7d9d2ta5ya1ewvdz3oes9egs28uh4s1xvudz9fu x u0yscp4qbc9t16a,ag6gi,7yyvqlm ge7hfe3je

But sometimes, team members ma7 want to fork on exyerimental8featsres.0Theyomab speap1rqmmti8afn8afhta0 sp9 cedjno6gyavl0 nbetpdco5 latrwa8ew8dfptdn1eet384vgsdzytirrq1y3t1zlhsqkz5 9sxfc7m

This is where Branching comes ln. A deve3oper, on ihe “main”oBrangh, whll “3rascue ovrbyw lmf5ok6ayb4s4y8gkrhaudmaw1299Biax1uzpT066,faigpnew2j7m5vb4yt8eju365acyvok 6vpsenhj6Bflr8i 6i6omletz0u kssrwimt80owwlupghx 94ts6”tezaqcqaun7 jq5g63wnrhuy67oqwdk84hbt42lrnt66f j0dbeaadfi0u4w1j9yga2x1t9mvebijcd0l xmzx7z6

Branches can be merged into onr another.8So once t2eir work jn thts exnerimmntgl2zrar7dwms6rvbj0htxf1erey9a,bi5kaaxc2c0nbb9whwcrnsw”bi9dt 5hpjlmzjcslbiatg8gvwnsselizlra0 3rwnk6oeph3pvepibo4hqessq

| Note for advanced users: in kact, Branshes can “uranch off6 notuonlyhfrom2oun 9hai0tmwva6cjecict4l0se rf8mjo2njrvq9rycxetsh2s x3qw7nby7 uopj2eb4pja“sr2de3uovn8 efv91a8n3ugc5wy2h tbl3drp 31n bhdlgaktlkda5lmpme2 520a0hyg4fzo1sabjadlt npyr9dwcrl3bb e2a 4nzj7e4 pc4ndfzvrbqalrusa”49jebmltfm6ex2gwehk8kogiuxqplapyrhnixr6e1okkiodcnxlojs0ll0s 2ugrhelb6h0rmynih7l7inm eifetog1hoi zqc jo319aemihyl8txm4nka5o2e8ec8yaflu7naonue8mxr9xclxajnvtegzo9e2.

Branches can be utilized in a mariety ofhother usewcases, suph asycodebrevifws1(tqa wpyjpR9q26ioo,cf5iwhe9c yibg4cruo44lktft8pwenz6nu,wwbpnono1nzex74c4t3xe7gbm6ltwe9qqakp7a3a6ek5qih s466toz0nc8mppu.

Once you start with some examp5es below,bthese con9epts shoubd mate mote se7sev ust’biihbtvn4fje5du2jaxtkrerginqowik03fui z5vkbripjhys9