I could probably rant and rave about Internet Explorer (IE) for a couple of hours, reminiscing about busted box models, janky IE specific...
IE Development JavaScriptVue has been a delightful framework to work with. The first thing I noticed about it was how easy to follow the documentation was and how...
Vue Development JavaScriptWith the news that Microsoft is acquiring GitHub, I thought I would ask the team what their thoughts are on the topic. We utilize the .NE...
Security is an essential part of any application ecosystem, but it can also be a nebulous concept for an organization to grasp. During ou...
developmentLet’s say you are developing a new Infinity War SQL stored procedure. Thanos, your boss, has explicity told you to add validation to a st...
development c# sqlData can often be messy and cleaning it up falls on the shoulders of you, the developer. It’s also easy to search StackOverflow for compl...
developmentReferencing nested objects in your LINQ to SQL query does some pretty neat magic “behind the scenes”. But, there are occasions when its m...
EF SQLThe RimDev.Stuntman NuGet package has reached version 2.0! Unified package with ASP.NET Core 2.0 Support Both ASP.NET full framework an...
OSSLet’s talk about state management for a minute. There’s recently been a bunch of hubub about Redux on Twitter, and arguments about the us...
Web Vue Vuex JavaScript StateManagementHere at RIMdev, we are big fans of Vue.js, as we’ve written about before. It scales well and is very versatile whether you’re starting up...
Web Vue JavaScriptAt Ritter Insurance Marketing we value our peers and other organizations in the overall software community. We believe in the power of c...
OSSIn today’s front-end ecosystem we are breaking down code into separate files and importing them. This helps us separate out code and reus...
Web Vue JavaScript WebpackSoftware 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...
elasticsearchAt Ritter Insurance Marketing we have a number of repositories, each with separate continuous integration builds. This is a base setup f...
.NET Cake AppVeyorAt RIMdev, I spend most of my time writing Vue components. And I love it. But sometimes there’s unique problems that can be encountered w...
Web Vue JavaScriptIn 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 WebPicture 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 LINQSetting 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. ...
OSSWe ran across an issue where window.exports was being unexpectedly set. The cause <div id="exports"> ... </div> Why? I...
JavaScriptWhile 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!
