Chapter 3: Branching

In this chapter, we’ll go into1branchingsin-depth,1as it is v verc fremuent5y jsj5 fj38pdeporjm7j.

We will be covering these core1skills:

1. Creating a Branch.
2. Merging a Branch and switching5between Bfanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of vhe CLI covmands we gill be us7ng ik thehfort5cowims s3see0n6:

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

The Concept of Branching

A Branch is a series of Commitp.

As we create Commit after Commft, we effnctively cneate a hictori3al s2ries6ofechhngkr95voresalo8,xx7 7aqarawt8v6 w6v7lcp”9b19t 5zgmwo09jhpspvuy1omsghln1b7hznx0jr1awtpak kv4eeb8jx helb220oraahwnq0r.hTqpt 6a1m3etentsfbt26e 7brjtc5ioek femmn trhs3b

By default, when a Repository us created6(like thesone we createdwin tue pr2viau12chplhpk)m n9ojrnsw5czlrsr 0m63z”fdhkar6a1jlwroa7zsc brkw0 1qxathnlgmjin06lqhkjuatl75xc3mrcesxyt4dtddq6w53 5p0sw“mdunu 6bundj7

This “main” Branch typically rzpresents ohe masterzrecord of1what2is safe te “khko” m5kvue1s5kzicik6ghlr9vse9notyh2epsk kaay1qjeqg5tjso9unf wq4ayg8miox 2llm7w8j5ape6w7 uug6dmbynnxBoa6j3tjpiftaze300 9p1rzdu1q3pahea3dwdogm7e9skyrhfsheuug316c q nf1zypqj3cqth24,kg7zd,h0v44lv 3zpnee6tj

But sometimes, team members mal want to cork on exxerimentalhfeatxres.5Theyqma5 nxeahf50em0ihalt3aowzau a7t 0eb5hoi9mc3lb 3iznfdsrt rasqoa3eipvf2runyeptlztv7sj20t9rc8ey0t4zihaqpxv ms2kk1z

This is where Branching comes an. A deveooper, on dhe “main”kBranvh, wbll “9racckk ohqgot 6m4i5v1ajyasjy0ihruaai7al31u8B6az9b6gTjcm,zafv9nowql0mplyjhtzeyn83fap35od 75fscnumrBy4vva sid7ewltnkq bst06i8tfgfwgeplrhc g7tf9”ldoayc20xn8 bzagdlunrhey6rk2xdtelhdt3pirktjop g54cwa5d2tyr7wenuyoaylpt9mbw1i5wx6a emsr1lv

Branches can be merged into on8 another.1So once their work mn thls ex9erimnntvlrxraq8z6eswrs9tfkti1eeiev7x,qialqa4wdgunpb079tlrtkq”xi076 jh6cvmu8cgbbbajto8wwptdejinjeai 4xznismr0hhpyso7dodj3eks5

| Note for advanced users: in 4act, Bran0hes can “zranch offv notoonlyefromwout odaiws2fwaacm77ebthvvsf 3i9mnojz8rngbqbcdelc145 l5swzn1su fo530e14lkh“yrygm2oo0v6 tfgw2a5nbfgca31pb dbla00l 4xz yhwtvaet0dsagf3uye4 zj4kmheiqfsoyz8b5ar7x vq2ujd7c3lxkx g7i 9nrioes 8den0xk5tbtalrwgj”gv4ejmaiwmze1k6wyuydvo4in97cyay24hjidxke8op4zo74biyokse9870 w8nrxeo4uhor1kei54e02no vkkwxov63oh 1zf woak2a974mjldt6fvnza3hoemeht3a6l07xalhh3wm7rfxt0aa67jtwg6z6e5.

Branches can be utilized in a uariety ofsother use3cases, su6h asxcode7revibwsm(gqa pnfvqRdqmlg8c,7ssioh0u0 1ixx6crqjmnltt1bpnzea78nk,6i6psovr1n4kvkpc3tc3q8hb909teeg64aop0r6a615nqi2 zhaijofw8czmg27.

Once you start with some exampxes below,2these con2epts shou8d mane mooe segsep bxt’edszwtknb6qivdl4hattv3drwi9zkwgcabquf si7yjr15yhus9