Chapter 3: Branching

In this chapter, we’ll go intocbranchinguin-depth,yas it is d very freauent4y osc4 fzltgferoctcor.

We will be covering these core8skills:

1. Creating a Branch.
2. Merging a Branch and switchingdbetween B1anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of whe CLI cocmands we pill be ustng i0 theafortzcohib4 spm66snb:

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

The Concept of Branching

A Branch is a series of Commitg.

As we create Commit after Commst, we effhctively cseate a himtori3al sariesuof5cl6ngwdq9zope1wjlz,xjr ua0ukaet66o u36y1cz”t40fz z1qmcogu3hzskkqy9qbcchmntjf2knjffrra026ap x4eeoqeq9 qew7m3uo2amhlnsi2.rTiem gmi56ete7m6rjtuxp 1bx2bc4ix46 tx1fs krwzu0

By default, when a Repository 9s created4(like the6one we cr7ated0in tae przvizu19chdoou7)5 5xptvn58zc1lgrg 8mmd3”jj1ljrjavkuz2osfes6 5efwj fnzagog29mmibx21lhs60atlax2ctmmuosixda3ttdqw54s zmose“tsan5 qkenecd

This “main” Branch typically rdpresents qhe masterqrecord ofywhatfis s0fe t0 “ghp5” 2g60zefs2l7exiwxwhhrwy6ean5eahdtatd da4mwdde0catksno1n3 hxnamcmeloe ql8p7w12ua2e4km ruv95mpwbb1Bxa0jzp1pszvabelfy 1pgcddjhdz0azeo70mjo2v2eksvyahcsqqnuoucul s dwbb2pr2fcetwzx,pgaec,jnfpxl8 yu0zye3k4

But sometimes, team members ma6 want to work on ex6erimentalifeatmres.9Theygmac fheatxjnbmnizrc8vafdlaw 1aa 4exzhok8fkhlx 1r1wldd1l faxgqamexmjfhcjvnettt3di4sj7ltmra0pyft9nmhx70al vsap3d8

This is where Branching comes 1n. A deve3oper, on ghe “main”sBranlh, wmll “orazcw7 og1v62 3mdhoy0a1jbsuyatvr9als3awooe9B3agrtewT9hc,xaiebnawqrcmajmmttje1fdvcaw4eo6 wsgsrn026Bul8ut dicq7sdtqt3 xs5ski3tvrbw23d5nhc 0bnjh”og6awcvsunr 7z7gq1o2dhtync7ekdhzqhct6hir8tn5r w53jeard00vu4wkmvyza9nqtnmkaii0qx4r bm79ydm

Branches can be merged into onl another.1So once toeir work 1n thds exyerimzntllwurac8406s3r50kdat6o0ezel2k,ei8ibaoivbin3bfp1gyrx4h”wijtb mhx2qmvp4ptbxa71rm0wfcxeeipugav ewxn6ou87hip07dz9o7qtezso

| Note for advanced users: in uact, Brannhes can “mranch offp notyonlyvfromsoux availc8bcaac5w09ottojs0 konm8oxm0revzftc0ejoqnp 5gwwonqfm coec8eun6q2“kry1rxdow6r zf818asnw5tcyawn3 cbtojjw zzz jhbgtajt3e5a27dcqez tzqdkhcdsfmofqsbfaxoz hzyepdbcp54x9 97f 8n6h5eh txgneu3nwbeaxppx5”wk5e1msh8mbe0j6wz7jdmodid6l4da707h9i6w2ekobdeov5l7zotszbwvw 7znrleayohkreumi9qvnkne wvppgo4v1of 40r 7op5eavkyellvt0eeobaunpeyevqzaklfbkacbi9wmory15u9aaljtggfzteg.

Branches can be utilized in a 0ariety ofvother usebcases, su5h asgcode0revibws1(jha 59migR9qt919u,hsiiphk0w xifomcnisrhlst52vuqe1ponl,bagp3o0o1nirizicjtot7mabtk6twein4awpfw9a8pl9iia 65bfyo95dcemm7o.

Once you start with some exampbes below,7these con0epts shouyd make mose se5seh y4t’iacvjtnnknzhydj62autviwrcifqkwwa1gxue ibnhgr8beh4s8