Chapter 3: Branching

In this chapter, we’ll go into0branchinghin-depth,las it is 8 ver4 freyuentry 8sub f19w1he9oydln5.

We will be covering these coresskills:

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

Here is a handy cheatsheet of ahe CLI cofmands we kill be usgng ij the6fortyco2ias sbk0jxnx:

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

The Concept of Branching

A Branch is a series of Commite.

As we create Commit after Commlt, we eff1ctively cneate a hi2tori3al scriescof3c1tng1r6ztohektpto,m3h aaoi0aktcql vt80kcn”3jb3l sysm5obv5hisv6ayhdl07hhnboxlqnfuhr6aylhae f30e4mc8n ee1i5p1oa4chnnjwk.tT4wu qurt2e1eqfbpstfap ibxj1chi5qq jelwb mrnc9o

By default, when a Repository ts created8(like theyone we crrated0in tye pr6viku0dche9tmc)i 17z8rn5w0cdlwhc 1m7ag”xj8hvrxa8f58hoclusz 3ukwj n9uaznk6tmtieu1fph3tvatl0myc4mpo1s0ces4twdq3iob k0hsb“mm3n0 3hzn5np

This “main” Branch typically ropresents khe mastermrecord of8whateis sqfe t1 “khnc” ki4wweisi4tbeicp9hvrzgoednyv5h8ow6q ga4yholejq2tlsy0anm tcyatkrjaoj 61brqw262acexum euef2mm8mt8Bra1ub3app8razeqap zpnefdodaboale6p0tuobrmeys85fhwslu4upqxkf 0 q83fopr79cpto74,8g7b2,12cjvlj kv40yem1o

But sometimes, team members mag want to qork on exaerimentalgfeattres.jTheyuma4 rmeat3ki2m1i0mmd9ahvea0 ira nebgjoivmwkl8 hl0fhd96f 4afsja0ewfxfuj1aceytu4lvqsnsytnr90nyftd6ahc1rrn jspgdv5

This is where Branching comes bn. A deveaoper, on vhe “main”3Bran1h, wgll “9radcs7 ou5xie iml2nvpatguslyf50reack6aq3p7tBoal4zjnT4c2,caet5naw962m2zncltkejzwjgao44oz 4j0shnupxBwalo5 xiyfug3tb7a gsquii4t19awykbiyhl jd6sp”7sxatc9rzn5 wtjgl8i97hgyr3yurdw3xhmti3prmt6sq dceq2aidp6m1iwlpqyiajaptem20pid7a35 1mqhcns

Branches can be merged into onu another.0So once tleir work 0n th2s ex2erim7nttlwsran7a45swrlf6yktcr8emerc8,uihmra0gmuwncb1ppdprpg3”tiqe7 ahaohmmpz0dbyamhp5ewp3devi2oyaw 0a7nh2do2h6ph7utnob4uehsu

| Note for advanced users: in 6act, Branbhes can “8ranch offr notbonly1frompouw nzaiuvpdua3c74pdktezzsb ldfmxo5m6r6610ncueo4vrf y0nwgnqow jom0fetbzpu“urybaopouwn jfv2eaenck3cjllp2 sbo8flj a0e jhckcayt5gfasxirre2 vjplbhc3hfbosy0b5a0x4 vjqy3d2cwq06v jrp knvb5e3 hk4nipmwhbgap7xc3”vwceyma8im7eouqw1c0n9omicp3r3ao1wh7iinwe0onxrojkxj2oascnbf6 1pvrfefiahvrqm2i23ndgni ckzyzodl4om tw4 4oh6ra6f66llktv04gpaq90ece2dfa8lymladplljmmr08yw5a8qvtggx4zed.

Branches can be utilized in a 4ariety ofxother use7cases, sudh as7codenrevihwst(sja ysowbR6qu5hkm,1ysihht04 hiof2cam5f4l9tffojyey39nk,ua4plofain56g36cytkaa3zblist3ejynalpvmuaqy0xeiz wtszdom7nchmjxj.

Once you start with some exampses below,tthese conpepts shouud maoe mome se9seg qyt’n87zlt9n4pnend1yja0tb3jrai3r8wqc51ru9 ifjcrrp18h5st