search

petrovicstefanrs / 30_seconds_of_knowledge

Google Chrome Extension that lets you gain new developer skills, every time you open a New Tab.
https://30secondsofknowledge.com/
MIT License
942 stars 121 forks source link

Add C# Snippets #82

Closed mrbeardy closed 4 years ago

mrbeardy commented 4 years ago

This adds all of the current snippets from 30 Seconds of C#, as well as the supporting code to have them show up in the extension.

petrovicstefanrs commented 4 years ago

@mrbeardy I'll probably merge this over the weekend and maybe even release the new version at the same time.

mrbeardy commented 4 years ago

Cheers Stefan!

petrovicstefanrs commented 4 years ago

@mrbeardy I didn't notice you made a PR to master, and after changing to develop I noticed there is some code I can't remember what it was supposed to do. I'll take today to figure out what's up with develop branch and then I'll merge your branch into develop.

mrbeardy commented 4 years ago

Thanks @petrovicstefanrs.

If you'd like, I could just make the changes over in the develop branch and force push to the PR, or are there changes that need to happen in develop first to line it up with master?

petrovicstefanrs commented 4 years ago

Thanks @petrovicstefanrs.

If you'd like, I could just make the changes over in the develop branch and force push to the PR, or are there changes that need to happen in develop first to line it up with master?

@mrbeardy It's not your code that is the problem, it's my old code in develop that was left untouched for a long time. I'll need to sort that out first. So essentially yes, I need to first sort out develop, and then either you or I can merge your code to it.

petrovicstefanrs commented 4 years ago

@mrbeardy Hey man, I've gone through the dev branch. Now that I know what's happening we can go through with the merge.

Would it be okay if you took your branch and rebased dev branch into it. After you're done with rebase just push again and I think we'll be able to merge without any conflicts.

mrbeardy commented 4 years ago

Hey @petrovicstefanrs, I rebased dev but this branch still had commits from master and shown a bunch of extra commits in the PR, so I've deleted the branch and created a new one from dev with the changes from the old branch, so we should be all clear to merge this into dev cleanly now 😃.

Lemme know if there's anything else that needs to be done on this branch.

petrovicstefanrs commented 4 years ago

Hey @petrovicstefanrs, I rebased dev but this branch still had commits from master and shown a bunch of extra commits in the PR, so I've deleted the branch and created a new one from dev with the changes from the old branch, so we should be all clear to merge this into dev cleanly now 😃.

Lemme know if there's anything else that needs to be done on this branch.

Well that's one way to do it :D

Anyway, looks good to me now. Merging!

petrovicstefanrs commented 4 years ago

@mrbeardy Next thing, I'll have to merge the work other people did while I was not able to work on this, and prepare a new version! :D