TL;DR Using ExecuteReader against SQL Server with a query using for xml or for json causes data to be chunked. A single call to ExecuteR...
.NET .NET Core 2.0 JSON XML SQL ServerAt Ritter Insurance Marketing, we continue to invest heavily in Web APIs primarily built on top of ASP.NET Web API 2. To supplement our A...
asp.net WebAPI RESTIf you CSS, you’re familiar with the browser -prefix. Chrome and Safari have -webkit, -moz for Firefox/Mozilla, and -ms for Edge. As brow...
cssWe decided not to use Material Design (#reasons) while re-developing our core application suite, although i really miss MD’s micro-intera...
UI Sass Semantic UISometimes it’s useful to ensure a project works with multiple versions of runtimes. In the following example, multiple versions of Node.j...
AppVeyorFor ASP.NET applications it can be useful to make a request to an application immediately after deployment to bring the application onlin...
AppVeyorAs a team empowered by .NET open source, we’ve always been sensitive to the people, projects, and conferences that make the .NET communit...
conference oss teamThe RIMdev team composition is a unique blend of disciplines forged in the crucible of time. We have backend developers, frontend develop...
Vue.js JavaScript frontend clientsidePreviously, I wrote about Publishing to npm Using AppVeyor. This is a similar post, but specifically geared toward publishing an npm pack...
AppVeyor npm MyGetStuntman is an open source library we developed at RIMdev to make testing user scenarios easier during development time. There are times ...
Windows Azure Azure Stuntman OSSTypically, running a Jekyll site locally for the first time requires a basic knowledge of using the command line. It usually involves a f...
jekyllA picture is worth a thousand words, so I assume a diagram is worth a billion words. Expressing our ideas is important and our blog is an...
JekyllBefore claiming we are in a Renaissance or that it is time for one, we should take the time to understand the meaning of the word and its...
.NET Community OSSAppVeyor does not currently provide built-in support for publishing to npm (at least, currently). Instead, we can provide the npm token a...
AppVeyor npmAt RimDev we’re trying to rethink the way we build our frontend. We have so many properties with common functionality, and it was startin...
Web components JavaScriptAt RIMdev, we are attempting to layer Hypermedia concepts into our APIs. One of these concepts is to have a collection of links to relate...
Web API ASP.NETTranscript Hello my name is Khalid Abuhakmeh and in this video I’ll be presenting an ASP.NET OWIN middleware library designed to eas...
video stuntman OSSHere’s some copy-pastable commands for creating SQL Server Express LocalDb instances: "C:\Program Files\Microsoft SQL Server\110\Tool...
LocalDbWelcome back for another edition of Under the Decision Tree. Our weekly selection of machine learning articles, podcasts, conferences, a...
Machine LearningWhile I generally don’t do that, here’s what I currently do:
Using Stuntman as an example:
> git clone [email protected]:kendaleiv/stuntman.git
> cd stuntman
> git remote add upstream [email protected]:ritterim/stuntman.git
> git fetch upstream
This will instruct `git pull` to pull from the `upstream` repository:
> git branch --set-upstream-to=upstream/master
OR
> git branch --set-upstream-to=upstream/development
depending on what the default branch is.
> git pull
rebase over merge
I rarely use git merge – generally only when the situation requires it. I generally use git rebase to bring my feature branches up to date when needed.
> git checkout development
> git pull
> git checkout feature-branch
> git rebase development
upstream
Branching is as simple as git checkout -b feature-branch. However, when it’s a branch that exists in upstream you may want to do this:
> git checkout -b feature-branch upstream/feature-branch
This way you can git pull to get the latest from the upstream repository.
Wondering if the current local branch is tracking upstream? Use ``git branch -vv`!
git push
While git push without any arguments may work, if you aren’t absolutely certain where you’ll be pushing to it’s a good idea to be explicit.
> git push origin feature-branch
I haven’t been in the habit of using this implicitly at all, but maybe I should.
Tip: If you aren’t sure what will happen, add --dry-run to the command.
My personal .gitconfig is published at https://github.com/kendaleiv/dotfiles/blob/master/.gitconfig – feel free to use it. Be sure to change the name and email. 🙂
How do you use GitHub? Let us know in the comments!
