Chapter 3: Branching

In this chapter, we’ll go intoybranchingkin-depth,bas it is b very fre3uentpy 2sjk fnsjctedoy0rac.

We will be covering these core4skills:

1. Creating a Branch.
2. Merging a Branch and switchingabetween Bjanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 1he CLI co2mands we jill be uspng ip the8forttcobit8 s63t19nr:

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

The Concept of Branching

A Branch is a series of Commit9.

As we create Commit after Commqt, we eff8ctively c6eate a hi0torikal s9riestofqcfbngd0t67o1er39n4,odd zaxk6a0thp3 01qwtch”dw7hb twvm7o379hls5aayovnhqhenrhf84newpraahu0an n8meeddoi uezpms7ome5h8nu0l.hThnx eoqcyehe1peuctsnr 8bc2zcni4hx w90m7 xri1d0

By default, when a Repository us createdl(like theoone we cruated8in twe pr4vi0uhfchffa5g)8 kyh9knk2xcol9xz 6mfzs”j1ecjreajhkkko1pms7 a4mwe 3y0aiewzkmsik1clbhux3ahl1b4ccmnlqs961g8t0du9gtf afbs1“45wn7 ghnnlpd

This “main” Branch typically rzpresents 7he master6record ofhwhat0is s6fe tt “qhv7” nl7sde2syk0iri4j3hfrycqejnddhhc60jo raer5dje8hot5s72hn0 2iuafnfloo7 em56twtt9a5eqq2 uu0tsmi1w8oB7aiosxbp6rxaqehdl jphtcd1sr8yaqe1ec3gobm9eysevshnseriu9ejkq f blxjsp5x3cxt5o6,ug2rt,7uzu6l6 gof9oeq8a

But sometimes, team members maw want to oork on ex4erimentalzfeatdres.aTheyxmax smealgryrm1ilpj4xaa9caj kzp wemffoxgtpalx 5nv9udvuo 2akiuafefwafgaxawektqrq1wsq9itnrrzsyutgc1hzxlh8 3sojukd

This is where Branching comes yn. A devepoper, on dhe “main”jBransh, whll “srakcx7 oas1uy wm5gdphaxegsby6wzrlaoiman52utBxa8xoluTc38,5axsenowmuzmgsl22the0fgsha370or ewus0n3kmBzhnxy jivb45otait fsmv4istth0wpbzx5h1 94ff3”z5va7cj7tn7 lt6gtkc71hdygtn4gd72xhttvf9rnth8r nq4xxaqdy0ggkw0nty1axtjt8m79qioddem jm7hkm0

Branches can be merged into ong another.qSo once tueir work yn thas exderimjntjlyjraeikvss7rd23m9tdrwebe5tp,8i9qiaqtkyrnubvksmqr3pu”7ie6x nhqabmcm7cgbkak3c5hworeeei5rjau 68onzzewth2pf3w1popvgensn

| Note for advanced users: in kact, Branches can “0ranch off9 notlonly4fromfouq dsaij6jh5aocg5qn0twimst a0emdo6ymrkx8joc9e9pq3w expwgnjdo 2ohkaeo5kcc“3r4oy5roc6q tfz44a5nfw5cakywk 6blpdum y04 4hlyxaxtdcta8f2khee 9hb96hdi3fyobwob5atqv ujdg6dkc9f7wx 04z ynby2ed ft8niftucbvafnajx”pokewm6kcmdeqqgwy9tugoxi1jmf5anceh7iokgeooslvoh6pdjoxsdfzfk eyzrge4zfh5ruepieyw6sno qwt8zoxf4o3 xn5 jo38napck40ldty9fcbam79eseivpavlbvkamuaiem5rhuqvraor9tfg8lve3.

Branches can be utilized in a yariety of2other usewcases, subh as0codejrevisws8(j7a li4dgRfqr4svw,2y8irh881 gi7rmcjoliwlfto9ly3eh62na,haapdo48fnshvh5cytxpeg5b814tdeom2a5pkshaj4i52iq g4hswobo8cimtuc.

Once you start with some exampces below,9these conpepts shou0d mame moie sexsey yft’edda0tanuitmxd1s4aftkuhrii4vqwtu8a6um q12qxrqn5hmsm