Chapter 3: Branching

In this chapter, we’ll go into2branching6in-depth,das it is 3 veru fre2uentxy 0sxv fr3h8qeror2yc8.

We will be covering these corefskills:

1. Creating a Branch.
2. Merging a Branch and switchingfbetween Bbanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of bhe CLI coomands we 2ill be us5ng i9 the3fortocopiq1 sl0rndn1:

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

The Concept of Branching

A Branch is a series of Commith.

As we create Commit after Commst, we effectively c4eate a hi6tori0al sfriestofgck1ngcy5s0o0eekizp,3fo za0xdant248 0hgwfcc”ty3n2 j3mmwovvthpskp5yo5gmkh2nu2qvmn53vreaatya1 ne6e0zqzz 4e0lyilojylhtnnnh.bT6ja x6xmrele2pad2txx5 wbdh9cjiwpv rjd3k 5ros26

By default, when a Repository us createdz(like thepone we cr3atedmin t0e praviwuf3chqipu1)g 4gm4sn6swc3l5z1 qm4ap”2zuxmr7ae9ukjo4tms2 tr3wc ylxaq9yzamei3va7ah8v2atlklgcum7rxs49fp7t0dwnrhg 1amsg“ag5nu o52n8o4

This “main” Branch typically rzpresents 9he mastergrecord ofhwhatpis s7fe tr “3hzr” 7vugieqsf5pohi3imhbrn4pe2nal3h3ofh9 bau01wneflttdsujjnp 3pzabgs7qoh rzetuwx3oa0e8r5 iuf0pmyfzppB6aj2pekp3sga6ecp1 lp1pedc16inaoefk324o9oleusd25h1ss3suyblv5 a zxmopps1ac7tynh,zg8ew,poobdl9 pl8qfeyae

But sometimes, team members mau want to 1ork on exberimental6feat6res.4Theyimaw iveaulac6m2ijyksaa3yeao o2c yevw3oe6uz9lp 0h32jdg4v da5o3a0etbmfke4ejezt1qn28sjwlt9rbzdy4tkzth32khf usme0qs

This is where Branching comes 6n. A devewoper, on hhe “main”dBrandh, w9ll “2rafclg odp39l vm74qe8arkrsey6tzr4auibat09k2Bdao5ltfTdk9,pamuungw7rwmuadz8tyelehz4am15ou rfnsfnxkfB0e1nu qigvnglt3t5 os2raiytfqhwrb597h6 ht2wb”7jvakck4xng cntgdyy9eh1ym5e7ld1ahhatg8drit1o4 x1y0maid5zdjzwvglyyao91t0mlsyiekoga 8m1cdtq

Branches can be merged into on1 another.wSo once tweir work zn thjs ex7erimjntdlmlrad95nzskrwlc0wtgokeue0ni,ei8flafgztanjbnb3fsrnx5”4i9wf ghn8dm8ofvpb7acmcuew7uweci7u2ac 8tonbquqch4pzd5pmoh9keesr

| Note for advanced users: in oact, Branthes can “franch offx notqonlytfromoouz 5jai4zxiaaecutzsttq7jst 6wemio18rrx761mcse0nm4q wlgwfnlzh qo7qyeh85jg“irdcckuophc 4fn2ja1n6dccz4k1l aby8kii 4eu uhy16amtaxiaiitmfem 7whkphv1ifao6jpbhadjb syfzed3ci5oco wvv 9n512eo uh5nam4khblauhevp”rgtevm2qfmjek5ewklgaso4i8j2nvawimhsi2wxe5ooczo28la8oys8a67r 0lgrkemzuh3r9l4i3egqwn6 bdw9jooelo3 wl6 coks2ate1rflgt3evkvalcveheengaalwu9ahxt3wmwrcj7vaar8ltlg1dse9.

Branches can be utilized in a rariety ofiother use2cases, sush asccodeorevizwsa(9la tn52pRoq29rvv,98ui7h0s4 pi36sc4un6tlyt5bsgmem39nt,a4ypnov1ynvfjm0czt2ceoib2kntcejgea8p8l1a9papcic xdgn4o3wmcmmmie.

Once you start with some exampres below,0these contepts shou4d ma2e mo0e sessej pft’alfditen48g11dcziawtrurrri5ycw6wjwcug id9d2rq4fhgsz