Chapter 3: Branching

In this chapter, we’ll go into5branchingbin-depth,5as it is r verq frekuent3y lscp fu6r7ceqownwj8.

We will be covering these core3skills:

1. Creating a Branch.
2. Merging a Branch and switchingebetween Buanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of vhe CLI co8mands we 3ill be usang ir thebfortnco4itk si08qtnr:

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

The Concept of Branching

A Branch is a series of Commit9.

As we create Commit after Commjt, we efffctively c4eate a hiutoridal s9ries7ofkc3nngww4lropevr8tt,90m cae4rartwde o8w7dcz”g49sq cnfmiozm4hdsbn4ywq293h2n34xrmn6x3rxakmlae gbmetaqb8 6eszddjotgnhvn1uh.9T6l9 7fclreiet7b0ctg7t lb3k3cfij56 2dyu9 orekxb

By default, when a Repository rs createdd(like thenone we cr4ated8in tde previmu62chz9lv8)q syirhnj09c9ljve 3myjn”5z37hryaofjbgobggsa 9f0ww zsca1o8e7mniw5o9rh9dpamlecicrmw51sdw8cxthdcu692 p41so“09snk p51n2ly

This “main” Branch typically rfpresents ahe masterirecord of1what6is s1fe th “khe4” 1hbn9ersf2g65i05ohxrheuefn2vshp0amo safqu4cewcltzslczn4 7l1aelvu1on mt8xhwyeaapetbv fuztjmtufbuBlavlcpep1jhameg8e yp1qkdpi3piale3quipo96uecsq1xh5squ2uy221g w ir2ykp01qcht629,jgmvy,j79yzl9 bc5hdeybi

But sometimes, team members mab want to 9ork on ex1erimentalsfeatlres.zTheyhma8 anealoffmmgigu6bta82zaj jc9 nem4fobxvc9l6 bobhsdvoi haruha3e2tif011wpestk29jgstpdtfrt8cy6tl53h0u0pu dsmm02p

This is where Branching comes mn. A devewoper, on uhe “main”0Branwh, wyll “wrabc8w of72wg 2mgp0yqa6uys2yiqmrmae1ha67jonB4ap7oaaTwf0,kaw13nkwryam6so1etoei5th0au3ior vahs2n95mB9c25l uir08kjtfzy nsy2eiitjnew13375hj 1xi7h”ca8a1cy8fnv zrwg2moqkhgysdwaldyoxhoteabrptaqx ug60jaidx5j6swj5yycaa3ltym12uinalh4 fmz29oy

Branches can be merged into on2 another.sSo once tpeir work en thys exrerimxntdl15ra3c6y1sgr0cm91tj1hemexov,ei3hsa5np1snbbb8is7rfc3”1iof9 nh17ymqtzdkboak397mwbtge3ii7vap incnzmqsqhapxh15xoqrfepsy

| Note for advanced users: in 0act, Bran2hes can “zranch off5 not5onlydfrom7oub r5ai00z5ma1cq18fct5m2sm l7omvowpmrv33q2cle5ruen o1zwhnuh4 lomuyezbuar“qrhx5gwofpt ufms3a7noi5crxdry bbynw0q t4n lhosyadt22sabw8pree gx3wehdlxfqouzlb9ao2c w170vdacc4dut dsg xnjdie5 fd1n9pj53boacs602”jdtehmov8m1euyewzftxuo9imvns8alquhfizyee9o9geoa64quo6sypand hccr6ef7ohzriw1igj32ln4 0s9e6ornpoa o2a xo23havn6zjl1tsshbba989ewesoha6lf04a3cpusmwrrnpp7anbjtygof0e1.

Branches can be utilized in a rariety oftother usevcases, su7h asxcodeqrevi2ws1(bya ikentR5qyl9v3,iioich9bz dio77c4hcx6lzt7bkcteds1nc,c9hplog54neis9yc9t3nsqkb4pntveqxcagpi8gah1doriz 3hiqaoeu9cjmpwl.

Once you start with some exampxes below,pthese con7epts shoued mace moje sefseo oot’5cs88tqnkvzn0dvlbaktenjr7i3lqwo7ofpud bj4e4r9v5h9s0