At Ritter Insurance Marketing we value our peers and other organizations in the overall software community. We believe in the power of c...OSS
Software development is a funny thing. As I develop my skills, I begin to form an idea of what’s right and wrong, what’s up and down. Thi...elasticsearch
At Ritter Insurance Marketing we have a number of repositories, each with separate continuous integration builds. This is a base setup f....NET Cake AppVeyor
In the whirlwind that is modern web development, I thought it would be a great idea to revisit one of the fundamental parts that make the...HTML Web
Picture a scenario where you want to page a large dataset and your LINQ statement has several Include-calls. The first few pages load fai....NET SQL Server LINQ
Setting up a local server comes in many flavours today. My goto was the Apache vhost.conf/hosts combo, now to load something quickly - Gu...gulp
[Hacktoberfest 2017][hacktoberfest] is upon us and now is a great opportunity to contribute to open source and the community as a whole. ...OSS
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 Server
At 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 REST
If you CSS, you’re familiar with the browser -prefix. Chrome and Safari have -webkit, -moz for Firefox/Mozilla, and -ms for Edge. As brow...css
We 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 UI
Sometimes it’s useful to ensure a project works with multiple versions of runtimes. In the following example, multiple versions of Node.j...AppVeyor
Update October 17, 2017 This doesn’t work with environment deployments, as this needs to run after the deployment has completed. See htt...AppVeyor
While 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
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
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
Wondering if the current local branch is tracking upstream? Use ``git branch -vv`!
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.
.gitconfig is published at https://github.com/kendaleiv/dotfiles/blob/master/.gitconfig – feel free to use it. Be sure to change the
How do you use GitHub? Let us know in the comments!