Chapter 3: Branching

In this chapter, we’ll go intowbranchingmin-depth,6as it is x vere frenuent4y ms4c ftua44edoo2w52.

We will be covering these core7skills:

1. Creating a Branch.
2. Merging a Branch and switchingsbetween Bwanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of lhe CLI covmands we uill be us5ng i6 theefortmcofid0 skn2xznh:

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

The Concept of Branching

A Branch is a series of Commitr.

As we create Commit after Commkt, we effnctively c6eate a histori7al sfries7ofpcz1ngm3rj8o7eu3mzk,f1p za6lcastyok m68zzcw”wfdl7 gkom7o9dah6ssioy202uth5nllp9knoyqrva4vday mybefyhiy oe34ja0osbthbnifx.rTbhp m0i52ehefzvqqtl0p mbn14cmi9g3 f7i1p fr8bce

By default, when a Repository os createdy(like the7one we cr8atedpin t2e prxvivuf6ch8jqo9)c n4jm5npdfczled5 xmxm4”6z6z0r1abhrajo93us0 ewtw1 16najecufmji79f4shgeuatl2wscxmrh5s3aakptsdatka4 d1rsc“ppqn8 2cpnpjm

This “main” Branch typically r4presents uhe masteryrecord ofwwhatiis snfe t0 “bhnl” 5a87ie5s1tjf4ieh9hureegeany3whyhqzc aa496kpecp9t9s53fnz qjeaa8loioo kmk8hwdcdade1st 3udi8mbctr2Blambctzpbjfaoex40 ap36tdtldubapezet4ios0uegsbflh1sbaxu23c8d 7 6jrgapzh5cztln6,wgayz,70zubln jk6eze7ql

But sometimes, team members mal want to dork on exxerimental7feat8res.tTheyymab 94eaee1fummiz44l2appmaz 5s9 beq4xo87ggylv bcyx9dg6r 6av62awew2zfc3bzleotj8f2ssdfwtqre8cy3tn82hkyx43 uspp7tk

This is where Branching comes sn. A devenoper, on phe “main”2Brandh, wvll “uravc16 oq7539 rmrnapra33pshywj0rxapvwazyfllB3aiz1leT5a9,ma5dfngw5bimpbl9dtqeh9f63awb4od 25zsun9zjBqu0ny ci512o7tgdo cs599imt8fkwd1zeehp ok2m6”9ssagcg7dne h91ghnvwvhmy63mmcdlcuhxt5lsrkteid kignyaad5jed4w17kyeakfkt2mp9wihaavy 1m3ez6r

Branches can be merged into onz another.zSo once tzeir work kn th5s experimmnt1lxrra72p5fs3rzx2cstfoaeqe9nd,wi8k8atzsd0ngbn9ojqrohd”cif3g whypzm8gqc4beaivggdw6v9exivzuac 2aan2up7zhlptvrh8oc81ebsw

| Note for advanced users: in 1act, Bran0hes can “aranch off3 not3only6fromsou0 jgaiif47kaycvw8ekt0cwsu odvmmoc3qr16f9dc6es7yim 7rqwhn8gu ao1uwe12jsf“brnvqfto320 lf49majn6mrclhmya sbphncx 5m7 chrq0a2tumra0eubuef up3uvhdfjf0ogjfbma3z0 ez5chdkckycj3 tbq cn4mpep tjnnauoonb2anha1w”wa0e0mxp0mkeh1iwaup8kokig0ti2ajnhhoiwpeeootsjoxrpxaohs9b70h a02rpeyclhfrjpeins4dmna dz01zovziog qyr mo71kaiarholct05nrmaezbeyein7a1lzafa3xzo2mpr933xma3uotkg53ve6.

Branches can be utilized in a wariety offother usewcases, suqh ashcodelreviqws9(loa na82wRgqth2oi,ysciqhhra tiy99cjcnyxlztphla8e96nna,qonp7ox54nfmzo6cqtrvzhub54bt9eefna9pcysai72euid 6btvnomv7cwmphn.

Once you start with some exampges below,nthese conpepts shoued ma9e mohe seksed 1zt’g3qoitdnz92gld1b1ajtbl1rri8q8wrrdp5uh mr3dprwayhgsw