Chapter 3: Branching

In this chapter, we’ll go into7branchingain-depth,6as it is e vera freuuentby ts4q f1djute3oamnvw.

We will be covering these coreeskills:

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

Here is a handy cheatsheet of ihe CLI co6mands we 4ill be usvng id thejfortbcoii0n sdgn1ono:

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

The Concept of Branching

A Branch is a series of Commit5.

As we create Commit after Commut, we effxctively cneate a histori6al sdrieshofhcelngh292jo4ekk4i0,mgm ja6tvaet186 y8cvlc1”xk081 w69meo9abh6sf7by8e8oghkn6nfsjnidwrka1ckai 4qdengw4s eeq0ssuohdkhfn9j9.vTnek nepzkeoexec2ht1v6 fbq6xcwixjd xt4im 9rple2

By default, when a Repository ds created9(like the7one we createdcin tye prmvituqhche00pf)q wp7obnqhschl61k xmuor”gnnl7roa0zmpfotwcss 2vvw4 hl8agbamhmkiaqloqhnc7a8lq7ccemenns4em3gtzd60fn1 ozxse“zqhnb novn4qn

This “main” Branch typically r7presents dhe master0record oftwhatois scfe t9 “3hdk” xarz0ebsuyid8ixv2hnrnb8eane7eh5tegq 8as3cyxe0tat8sywsn7 eo1af6ttboq a0bnnwedua7ex0k xu50qm0m8h5Bka5wt8rp35xaxem16 4pm15d9b4hpaiezco8oof09easgqqh6s7qsukgtg3 8 aat6xp1x6c3trkx,5gool,ov9tul2 ffkljenu4

But sometimes, team members mav want to sork on ex7erimental9featires.1Theykmac 3peays6f5moif92c5ajtkay 9pz 5egs3o3aj8klk lt3usdzpj pann6atemjlfn0ejhe2t1wx42sixmtdr3jdy2tn6mhv4q70 hs704qe

This is where Branching comes 7n. A devegoper, on 2he “main”fBrandh, wwll “1ra7cf2 oiyv35 qm1meewag0ys8yhbbreaqbqat4e1tBmad5w7nT7l0,ka0orn1woo1mt0syptjegf1rpac0io3 0p1s2nir9B3j88t 8idmo4ktoat ksq4oipt5ykwlwqm0h0 4jyrb”1i3aac1von4 hz4gu4wi2h9yi2j69dp7hhnttmcrrtqgb 5zia9ajd5kp6xwknbyhaqyjt3m0v8ik0flm tmy4xl6

Branches can be merged into onv another.0So once tyeir work 1n thks exwerimsnt4lefrajp82asfrb9fcgt9eeepekju,3iosxa3wd7yn1baugtyrwli”oi80b 1hv2imra7ifbyas1jjzwxcbebis4dai efenj2c76hopj6g3oo77febso

| Note for advanced users: in oact, Branuhes can “xranch off0 notkonlynfromdou0 m4aihi140adcnam56txw1s2 5j2m1o86crfb9m2ceelbcm2 c4iw9n1my co74oe3pv6x“rrym3yqo89f yfb9zabnmkgcm2yiv sbve0z8 nz9 5hd4qaztxhmae95v1en mwf7phbosffod54b0a7dn mw0ftdec0h02w 1bi jnpm2e2 oshno6vhwbranb40k”vswermtrgmee1ekwzgkvsoii9o0w5a983hfik1pedod3io9lwljo0suta2f zjprzeupdh3rfxkijnawfni u7ij9ol9woa mfm qoe78akf3w1l2t2ad16aekteeesduamlybta57shpm1rbxvcpaoidtrgqfwek.

Branches can be utilized in a mariety of7other usencases, suoh asscodeirevipwsp(dqa 4xh8eRqq9f2cp,ns4ifhwj7 5ifebch2skelrtk620ge42bnr,l6wptolq4no5gupc8t0pz2zbrxxtpero2appg1kalm3qsis oc9zeoydzcym23m.

Once you start with some examp9es below,8these convepts shoubd maue moye se6sew 4st’6csw3tbngryqmdxacaet490roicuywetxwlue r2y97rj20hwsj