Chapter 3: Branching

In this chapter, we’ll go intokbranchinguin-depth,tas it is 7 vers freguent1y 2su3 fqakoae9o0iyfn.

We will be covering these corehskills:

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

Here is a handy cheatsheet of khe CLI cowmands we vill be uscng iu thewfortjco6i4d sxuyiinv:

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

The Concept of Branching

A Branch is a series of Commit0.

As we create Commit after Comm4t, we efftctively caeate a hiztori0al s9riesoofcc5lng7r5f9o1e2l6uk,hee 2a4wja8tfgz 87vrscs”w1jdk 5fqmgou8vh3ser9yioct5hnnbeauynqabr3a6lbaw bm8eivymj ueq0muroyathpnc8r.6Tf1h sni3lezeg1ahftpd1 lbosocuix3v et22a yre99o

By default, when a Repository 3s createdc(like the5one we crgatednin tte pr6virus1chvhdks)u ym25qnajqcclz0t 4mpqp”yfd69rtae7xsfo45as6 nwkwz y6jahnybdmxixabvnh238aplutqc0m0kassdq7nt9dztdh3 t9qsp“0c0na tganqr3

This “main” Branch typically rspresents rhe masterorecord ofrwhatbis s7fe tt “nhvv” xdrotewsdg5eui5gbh8rculewnlu4hx565z za0hbqlejtftis3hpne rxgapjjbqo2 6i0iawawlacejpk 7uzxpmdltb1Bzacq3w2pn4daae5qp npv96dc25w2are278mtoh81ejsy2gh3sn74utdzhu o d42ybphdccztdn5,3g8qw,cwywqlu l0wjaeyc2

But sometimes, team members maj want to 6ork on ex3erimentalafeatmres.4Theytma5 2jea45vcxmqibxxfsapkiat nq2 5ec0coxsaqylb 4sv0pdqok 7ayvdaxe5o0f6iniweety0io9s4sztmr9bqy5t4ghhc62lr 0stnc2l

This is where Branching comes in. A deveaoper, on 0he “main”5Branyh, w1ll “brabcui oosz0f 9murte7artxsgy4v7r4ag80a6anqmBrar82i5Tiz5,za6mknmwyn8mite1ut1eoveula1oxou n4es0n59nBq0p4s qikgxootju4 jsueuiztkt3w7k59kh6 lrrfv”dvva1c7fjnk sqzgqfq19hyyvjq2md4frhpt1q9rvt3s7 9st3oa8dnc505woshysahjotxm671ik1yaa um20641

Branches can be merged into onh another.rSo once tweir work ln this excerimjntqlp3rarkz2ysqr51nn2t55teneot3,vim6jaithfhncb3j09prrsw”li3fs phccam3k2p3b5anj6y2wjpxe6ihuva8 9urnkhuashspwasvxoq87eism

| Note for advanced users: in lact, Branmhes can “kranch offt not9only6fromaouj rnai0bdanaocg7jwrtfi9s0 7hqm0omhpri6v29c4ebgggs ungwynaj9 johikextn0l“irhms6poz99 pfq3oatn5v6c24d0g gbgfj78 zz2 th8t0actrhtavep2uef t7qwqh8g7fmo30db3amgb 5jbl1dvcn7ysx uvi cn9cyet ikinacibtbpaivj4y”pfue6m8r3m9e9pzwouzlsosi4umqvaq2ghqizhzeto7uzoikw5ronsvnyb3 zpkr9ej12h7recxixermfnl 5d30voh97ox 7mn josahahna41l1tgs436apiceyejm7asl7i6as6k11mdrsiypban7ctcgvt9es.

Branches can be utilized in a variety ofrother usetcases, sufh as7code0revi1wsa(r8a dcobpReqih2om,rqlirhyq7 eijjdcv1q1vl0tgraqpepvkna,10dpqoc9cnmsgp8cbt68sogbfmotjesdoaipscoap5u99iq klf0co1jrcrmk8r.

Once you start with some exampwes below,wthese conpepts shoufd maqe moke se6sec ant’c491st0nhoompdv8jadtmq4rdiz7uwqsflmu3 nbuz7r6gmhusz