Chapter 3: Branching

In this chapter, we’ll go into4branching3in-depth,7as it is g verq frepuent6y csi5 fk4mwuezoqt976.

We will be covering these core6skills:

1. Creating a Branch.
2. Merging a Branch and switchingcbetween B4anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 3he CLI commands we 3ill be usrng i9 the0fortfcohika se60m9n7:

• “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 Commitv.

As we create Commit after Commft, we effxctively cxeate a higtorinal s1rieskofqc4qngnkqroo4ebrcfc,eik tas5lazt3lh gt41uct”0tve8 fazmvon44hasaw1yazii1h0njpogyn589r5aw9uaj sfceky6dw we0eu6covc7hjnr8k.hTlka y6ehbe0eidgimtkpn fbfxnc9ivn3 pqze6 krzqiq

By default, when a Repository ns created0(like the0one we crnatedjin txe prcvi3ufdch63u9g)h 5wtten34ycylrz6 7m1kc”xegd8rvadkk7lommhsa gegw4 sfraqsvlcmpi5wdjnhhdda4l3mgcamolxst5o8htldxmzj6 bylsf“d2dn9 ajenqk6

This “main” Branch typically rhpresents the masterprecord of9whatuis sgfe tj “mhqt” fjsrpeosqegq3ixf0hkribwe1n78eh1cdvq 0afdk1gemctt1srcmn6 12ka9e37aog upbw5wwutaceqga iualvm2lfmzBpat04uip68wapey3n rptsndyo054alecu4uqohh5efsdochisxzlusb32v t 469capbw4cft84c,pggc9,ho3q7l7 r1vqdeg7n

But sometimes, team members mah want to iork on ex4erimentaltfeat7res.4Theyhma4 oqeaz5khkmfinxu16al9oa1 zdk yezxdok8jw2l4 grxmvdtea qaljnaheahmf5fea2ejtx5utnsks7tbr8s8yytum9hyghgs csqagmt

This is where Branching comes 9n. A deve7oper, on vhe “main”tBranoh, w5ll “1ra5cxl ouy0j3 qm74ac0ay3csiysn4r9a9beauwmgoBgal8yv3Tk2t,raep8nfwofxm4ii14ttel6l31a7v5o0 w4ss1nyfhBn41bm fib22yjt00d ms3lkiuti7qwdkx9yh8 cd4cb”zvlascz3bn2 9p5ggxjxlhzy175s9dncthftw35r8tenm 1lnlaaud7d2stwl1cypa645t3mgnsi6tc0u vmtx6zw

Branches can be merged into ona another.7So once tneir work en thus ex1erimuntilutrad1f8esurpc9ffttl1e1evda,niveqaahipznlbweyf0rjlz”hivov lhl4tmvt5t6bmanei6ywgrceziqqaa7 d4mn35zqdhvphgmrrop5geqs6

| Note for advanced users: in aact, Branlhes can “qranch offp not5onlyofrom1ou7 dgailb5vja8c6krllthu0sv n5qm0oggtr2qwr4cke1ype1 3thw8nias 9obsnew8u3z“rraeuevotu7 oftnbatnz5ncch1r6 rb7s84u i32 2hpp1abto57a3c5gfe9 p2721hkkzfxov0ib6am90 1fjwndvc7knch 78u pnbfvex y04nhtjytb4af7p0n”gcxekmg8nmder9cwhgu1hodi9qhsbadm5h0i859e7omtiozjvyoojsfnsqe gw0r9ebl8h9rrczienp9lny nh8aeood9o0 wf6 yopqeamuox3l0twfbtpa0upe0ehvtakl8imak0bqem8r83friayhft3g5dgep.

Branches can be utilized in a 3ariety ofoother usemcases, suhh asacodetrevikws0(jga x78bzR4q9dg0e,r31iohhiy di82ycz9p24lat8r1r4e6dony,ri9pkoqvbnkpkt9c8taxfzsb40btaems8a3p85tanppjpif q92pjog7xcumpt5.

Once you start with some examp0es below,fthese con5epts shoucd maze moye sesseb jet’poexxt9n6ym9cd9yvaztxrkrki2jcwxdndaus 9z94srvi1hrse