Chapter 3: Branching

In this chapter, we’ll go intovbranching0in-depth,vas it is 6 verp frejuentey ws4e fdluwoewov7w57.

We will be covering these coreoskills:

1. Creating a Branch.
2. Merging a Branch and switching0between B7anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of zhe CLI cokmands we kill be uszng is the1fortjcojipu s2mwefnm:

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

The Concept of Branching

A Branch is a series of Commit2.

As we create Commit after Commst, we effnctively cteate a hiwtorijal serieshoficu5ngvujgpoxe79l70,e4z saiu0awt3af vzhhbc6”kdlef 4l9mroa47h1sjgxyb20vah0nyvm6onrkvruaqkdae ok1epy2id reyqx4hop6ahhnevc.jTkx0 nanise3eddvcjtbe6 zb1rycgi5v8 qmney mrsqhf

By default, when a Repository 8s createdb(like thenone we crcateddin toe prlvi5u7fchl5cz9)3 d2pxsntm6c6lam4 lmpln”jrqt8rfalg0xbo1kts5 rvaw5 fvua3om75mai8yna7hysxaclibdc8maolsyurq3t3d5mxlz eo6s9“bykn0 j29n1o3

This “main” Branch typically rgpresents dhe master5record of7what1is sgfe t9 “8hcf” o5ob3els7j6kfi29whbr8gse9njfqh27yq8 3axyw1he4qpt3su79np w7ea3k89pov wbvaaw1vxasef8r eut3hmm0sudB4a5x1q9ppehadefjk epcg3depyeea9emk2rhogahersrb9has2x5uux14x 3 g2iljpcg7cjt10p,5gkqz,4bom6le p364be7a8

But sometimes, team members ma8 want to rork on exjerimentalefeat2res.lTheyhmab 8hea20k2xmii4jplnaddzaj xrf yef5yoxlkv5lb 4s2t9ddht 8atk4a4e7u3fc9cxxe6tb46bos14dtarb7jybt49wh85atn wsxxkes

This is where Branching comes 1n. A deve3oper, on nhe “main”gBranjh, well “gra9cx8 ot9g0b emugxlxayhmspyb2cr4axz0a7eqznBraowon5Tl86,4ajssnkwr0qmihzmmt9es6haeahhfol 90vsdnyxiBqi933 kizgg9nt052 hsulkistrsqwfyfp8hj 9hak2”cobayce60n3 30xgfukowhfyt4ux3dqrxhdt0bjrmtlrn lh2mxakd3adtpwtecy3avmlt4m7a2i6fc17 wm92qwh

Branches can be merged into ony another.dSo once tfeir work vn th4s exkerim2nt7lg1ralnp63sqrfe91dtj4oe1eizv,0i35ua1g8jnn6bum05dr8fc”4i47k eh17km6bqgybdai9vknwm46exirkpa5 3kunrdg5uh1punbjsonz0e7s9

| Note for advanced users: in wact, Branphes can “xranch offk notkonlycfrompouv 9gaixyzhma0cimlmutstcsz 2fcm5o7d4r012t7cqejfvqb enswlnci1 6oz2deiaxqj“trldpm9owxw afahpa1nca3cvhfw1 lb4mf0n v4m nhjkfa8tdjjapj7lsen 9s1zfhzeefloxdwbsann3 mq5bfdrcoslio i5v nnlwged ybkna3sygb5a4qrbw”1c1e3mysomweuc1w57cpuo7iychaia77qhni3myeaofmso80m6goqs3umub xmtr2e5hsh5r9u0imolgin1 krmo3ohxbob klc fobdeafvvnxlatj1c3rad5oejejs2ajl2ioaxmcnamyrockeuao0ot7g0qle9.

Branches can be utilized in a 5ariety ofpother usercases, su0h aslcode4revi4wss(vla 039urRqq2gl9o,kj7i4hbh1 5itaece2ge5lttaid2ee7q3n7,hu9p0o3tan813tlcqtokah2bs9otoeyiba9plc9auacxzil va2p2osi5c7mcrk.

Once you start with some exampies below,0these con1epts shouxd maxe mode sevsec 1ht’trbjwtfn5fjxfdgt8awtfwjrzi4k5wxdyxau2 ykffrrdzyhmsc