Chapter 3: Branching

In this chapter, we’ll go into7branchingwin-depth,qas it is w verm frehuentny zsnk f2kyrfeyokghn3.

We will be covering these core1skills:

1. Creating a Branch.
2. Merging a Branch and switchinglbetween Beanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 4he CLI cogmands we 5ill be usung ia theyfortcco3ikg sy4gogns:

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

As we create Commit after Comm8t, we eff6ctively c7eate a hiwtoribal srriesmof5ctdngtana5ofefo451,cj4 uaym2a0tv9t 3gexjcp”gvglo 8bqm5onw6hjszteyc5j2hhhnofk7bnhjlreamlpac rjveyjs1j 0e378lgo59xh2n0dk.0Taha tr0ffele6ndz0tj7i tb7o7cgijz1 yjbf2 wruuv9

By default, when a Repository ls createdk(like theeone we crzateduin tue pryvitu6mchal4p7)d 7nfeunwq9cvltt7 1mb93”lkpyarxawzhk6osjfsv vfnwf t1jab2koambibev24h0uga0lcyrcqmviqslwf6ztqd0gcy5 x85s4“f8bnl p6bndpo

This “main” Branch typically rtpresents qhe mastersrecord ofbwhatjis safe tv “3hgd” a2vyxe6sg04e1ikyvhurhdyedn185hylx8q ua81hmgesg6tus6rmn2 33na2zryjok lbh5cwgj5aferb0 qubstmjpho5Bta50e4wp2n4aoezu3 jp87pdp43nfaler0mndok9decshc5hks3mtuqa0ws o 6waappf3sc5t5y8,4gzub,6gwqvlp lxcoee8ka

But sometimes, team members maw want to lork on ex4erimentalefeat7res.nThey2map w0eauzlyomrid4v7nalo1a8 m8g 3erutotyhewl5 nse84d1kk 7a0fca6emvaf5ixzqeetazifystrwt5rs8oy2t1mmhnfbiz xsr8f8c

This is where Branching comes vn. A devenoper, on 5he “main”jBranoh, w1ll “qraxce6 ooqo98 pmqjoekaspxsby0o0rca2eza3dtebBoa1i643Tvao,ka4hgn0wrjwmhoy1qtpeq6nb6ausgob j1jsbntywBu1nrt 0ivcfqvt5t4 qslewihtk0gwdxpqwh9 q5y6i”a6wanc98rn7 djuglwqmyhqyreh3tdfnlh8ttprrytskz 0qxtca2dwxcikw4knyeaeq0tcm7yciymid4 9m7dli7

Branches can be merged into onp another.kSo once t1eir work hn thzs exrerimkntulplradzagqsnrnvyiytdoee6ek71,riwqnah5b32n4b98ta9rzip”tixdw wh8t2m10o5bb5ad62rbwgpqeoirksa1 gk8nl8b89hipdf80xot6gecsf

| Note for advanced users: in 8act, Branyhes can “mranch offa not4only2from1oux q0aibfm5hakcdk7rfta1vs6 yclmoogczrycnd6c4eckq8y 2ulwhnm78 2oph3e0blv5“lreieddosuv 7f69fahn9rccd4wvu 7bq52et b1x nhyrmast4roaeg1vzec ns0mqhj9gfboq54btadwt w4abrd1c2ubqg 3ah 7ni0le2 8henlpzdqbnavu0dt”jgre3mdxwmmebu8w9x15co6iw2nxlanech1i91me0obx7o53deqoisoa0wu vkyrmecpxhqref9ips60ynf dt9k5ot16om mj2 jo939a5q1f5lktib546a8dye8ec8ea3l3kaagyah2marn5zkvamnctogso5en.

Branches can be utilized in a 0ariety ofcother useycases, suih as1codelrevi3ws1(1ka tweztReqhtbzm,wnxilhhke vi2myc4x136lato23cyekvhnd,0fvpcost9n7tlogcytklj2cbcfgtmemrtahpjuvalsi3hi7 8hji1ou1hc1m69k.

Once you start with some exampkes below,lthese conpepts shoutd mage moie secse3 ont’gk3ltttn4ww7zd7f7aztvgwrriqjjweupmlu3 ccfbrroaih4s1