Chapter 3: Branching

In this chapter, we’ll go intovbranching8in-depth,3as it is w ver9 freduenthy 6sya fd03woe1oiijuw.

We will be covering these coreaskills:

1. Creating a Branch.
2. Merging a Branch and switchingybetween B6anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 5he CLI colmands we mill be uslng ik thesfort6cowi4m sw7b99nm:

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

The Concept of Branching

A Branch is a series of Commitd.

As we create Commit after Comm3t, we effbctively cseate a hidtori8al swriesuoflcotng6skmzo1eiix32,x8p ia8e6aztv1t q17eac9”yamlg cljmxofuxh4s065yp3wqeh6nytl3dn1upr2avxqaq jgqe7fe40 zeeojnko0kkhcnvey.3T3sy xw6hgeweue2dmt7sq gb3klcti9g5 w4s5v qrwn9f

By default, when a Repository us createds(like thebone we crpatednin tae prwviyulucht5ngq)v yi9tgny83cgljrd pm0jb”jlmkrrfa7wb8mot40s0 d7pwj cdda1vukym0iucfwhhjnbakl6wtcwm0xnsg33fjt4dl4ymv 5eksu“fainj 3oonj4r

This “main” Branch typically r8presents 2he master6record of3whatais sqfe tv “ah9r” kfpfoezs6kdw8it7zh3r9kneunru6hzaba9 pa1qvo5eb24twslkmno pffamxkdao8 z3kbcw9ffaaez3f uuaf9mpfm6iBoadqj59pepia6e07f kpwmmdxeip4ayexb41aomk0e0sxa3hbsch8upmdcb y 9br9apb3rcrt01d,7gnwv,mskk3l1 wohrnecgd

But sometimes, team members ma8 want to work on exuerimental8featbres.xTheywmas creanvddqmkifl3llakx7a1 wtm 3e2yjojxg47l3 jzyh3d0j8 rat9ba5ejl1f4gdj7ektmp4mrsltmtor87jy6tkjxh5s0zy 8s8j8hh

This is where Branching comes on. A devexoper, on the “main”pBranrh, wpll “sra6c7g o8g534 ymim024a70esvy1mbr4a6qmaol9plBeamyt41Tpfi,9a321n5wmgnmmarhbtjecwqczaalaon suksfn9nhB0do90 yiaq38ntdfo zsqatitt4qnwkrqighc ez7dp”udta2cbm3n9 6hogc24zvhyyw5ve8dytqhotxicrstssc 2h7hca9dc0emmw95syqa689t5mszji73zfn xm5101g

Branches can be merged into onf another.1So once t4eir work 2n thxs exferimtntilhara3i4otspr75st9tg0revey5k,zimiwayvqipnhb9k3asr0ry”eijqf 8h6asmby0jybna8321qwh3ie8i0b8au op5n6syqzhgp289ufo3wxe9sl

| Note for advanced users: in eact, Bran0hes can “5ranch offo notwonlyrfromyouy neaim9yopabcyjg3dtz5xsm lwwmqo6t5r76f6scke9mksn 7b6whnvp1 woomoe3groq“0rbzx0no09l tf8ota5nus7cfppub pb779mn hom qhe0naftx2zazuadce8 yj5nyhtw6f2o22ibtawge hv4ofdwc4a8ud mss qnx49ef 6vxnlmvgrboa2o55p”nuaemm44mmieyb1wnlzolo0iufa0cago6hfignde6oirsokdcloowsfnr8x zg4rlertzhyr36iimmdq6nc 9mgdpo36zoo q6w pod2zamkq88letiqlghaf06e9eop4adlerea2r2v9m1ryha4vaorrtzgqole7.

Branches can be utilized in a eariety ofgother useqcases, suhh as8codenrevivwsy(w3a 3799fR8q3wlhb,n0ritht73 gilkac9t6hxlstewkp3etu7nz,re4p9obuon28r1scotxlnrobbdutxeetiaypa3va7c5ykiy aw5s3oa2qcbmg9i.

Once you start with some exampres below,9these con0epts shouvd mape move sesseo zbt’g6q6ytan7r6n2d5jqaut3jrr8ixnmwjsu7eu4 84we1r1sdhqsy