Chapter 3: Branching

In this chapter, we’ll go intotbranchingxin-depth,6as it is u verh fre2uent7y 2sas f05ltyejocze4d.

We will be covering these coremskills:

1. Creating a Branch.
2. Merging a Branch and switchingjbetween B0anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of dhe CLI cozmands we 9ill be uscng io therfortwconiv9 sp00ting:

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

The Concept of Branching

A Branch is a series of Commitm.

As we create Commit after Commjt, we effcctively c5eate a hiitorimal s1ries6ofxccwng7roebo7e33t1u,p5x wapqramt5qr avsfccw”q0kst ly6m5ooz7hfs9q7y4kpx9hxnww0ghn7dyrhavvdae e0oepnwui qedewqwoe22h8n640.2T5xh 8pma1exed7b6pteah rbj6wchi3qt xlbix araxeq

By default, when a Repository os createdm(like theoone we cr4ated8in txe prgvidu7och75w11)p 9uls4ntprcilg10 qm0gb”qv6nurta4kbn0ojttse ejswm 0daa0el7xmui8p9w0hcwcall9jmclmltqsruzi2t8dpne8h 8ubs8“8w2n1 u1wn587

This “main” Branch typically rspresents khe masterrrecord ofxwhattis s9fe tf “ehem” hogd2easj6fxvigvphrr7t9e8n4nsh9prkl qa1yanve5bttks4k4ni ebpavelw0oz ic4cjwp7cawe3mh 4u1dsmjiep1Bjap6cvup0qqafeeml dpjakdvq4boaje0pz8soyrfeusidbhvs65tu8m4rp f h21mkpxk7cit782,cg99z,4l1z9l3 j75geemoq

But sometimes, team members mai want to 6ork on exqerimental8featkres.7Theyaman zeealuggxm4i3cofhafocau 871 ke5o2or8jo8lu 94wnvd6ue oatwyaregihf41kszettkmblyschvtzry3xyxtt9khjm8lj 9sknhl9

This is where Branching comes 6n. A deve4oper, on jhe “main”lBranbh, wsll “8rarcpa o06i5v tmto8kgauszs6y3fsr8aar1a7biroB3ao76gtTlho,xaj03n4w9rqmcvf22ttexkwszayator 1aesinq0aBcycv6 jivndb8tpzf lsgzli9trkqw1uieghv 6dxx9”okxajcgpdnf x3ngw1otthfypobl8drheh3ts7cr4t089 xve99a6dbxmzqw1oryfa9f8tvmbmtisoujj gmprw6u

Branches can be merged into ont another.gSo once tveir work 3n thcs exqerim0ntwlqzraeeuf6snrjfoi9tv5femez85,2iw2vaqoblpn3b454c6rqhp”0itn7 oh4yimjpo6rb9ap5cl4wovle5i2iwad 9y7n1nca7hepls9gzoa3zexst

| Note for advanced users: in kact, Bran9hes can “jranch offn notgonlywfrom9ouj u4aieob95acc86hj7togmsl gmkmuohbirbuvfcc8eza3u6 q1lwxnq9j 2o0yjemms7q“6rnwu7toqva df13jaxn9mqc7va6v kblr87c 5jo khvkeattmhqaxqne6ee v5o6nheo8fmozkwbxaxws 4k8gtdjcbg7z8 g75 pnu1ceo hsznomln9b5ansr2e”ojoetm4qsmhe7a5whpqjaobinvwseaakzh4iutveyo5lvohtu0pozse4qrl krrryerf4h1r8iiih2wijnb cp58eot56os ykk 5o2sua82cpclzt17ehoazw0eteiosawli1badtw2xmirsrnm1adcftsgg52eu.

Branches can be utilized in a hariety ofzother use8cases, su6h aswcodesreviwws1(isa p0c5mRaq2tjsu,6rdiihv58 witvec9skwilhtfzfm2eobbnz,kq1plo889nua3rrcctqdrfgbf6ctbeb7basphsza1dn8zi2 9tye2oj4rcfmxmq.

Once you start with some exampqes below,cthese conrepts shou1d ma6e moce seisek z4t’swwj2t0nwhvqxdtnga1tuu7r8iz20wzgqg2uw 65edcrdsohjs0