Feature flags can be useful for changing the runtime behavior of an application with minimal impact. Having a UI to toggle the feature fl...
.NET asp.net coreWhat is a machine key? According to https://docs.microsoft.com/en-us/dotnet/api/system.web.security.machinekey?view=netframework-4.7.2 a...
.NET asp.netWe’re in the process of upgrading our infrastructure to run our Azure Web Apps in multiple datacenter locations behind Azure Traffic Mana...
.NET asp.net asp.net coreIt can be tricky to run integration tests targeting a web server using the command line. Essentially, we need to: Start the applicati...
JavaScript npmI was trying to get a global .NET Core tool working on my development machine, which just so happens to be running macOS. I also work wit...
.NET macOSWe’ve moved around CSS frameworks in the past few years, Semantic UI for our application layer, and Bootstrap for our static sites. As ou...
SASSNew to the frontend at RIMdev, or looking for more about our Frontend team? Here’s a quick overview of our team, tools, and culture! As ...
Team RIMdev FrontendSimple transitions Vue.js has an extremely helpful was to handle animations in web apps. In a simple example if we want to display somet...
Vue.js JavaScript AnimationsAs web applications have gotten more complex, so has the technologies used to build them. Magic can be good when all works as intended, b...
Webpack JavascriptWe’re in the process of scaffolding out our Microsoft Azure environments using Terraform. We’re looking at deploying consistently from ma...
Azure TerraformRequirement ASP.NET Core 2.2 or 3.0 Why can’t I do this in earlier versions? Read ASP.NET Core 2.2 First Look – Endpoint Routing ...
ASP.NET Core Routing MiddlewareHealth checks in ASP.NET Core are useful for reporting the health of your ASP.NET Core web application. But, this functionality can’t dir...
.NETAs I’ve walked through upgrading a number of solutions to target a new version of the .NET Framework, I’ve compiled a list of helpful ste...
.NETWhat is WSL? Windows Subsytsem for Linux (aka WSL) is an excellent tool for running Linux-based binaries natively in Windows. With the i...
WSL git ASP.NET MVCIn development it is common to not want to share everything in our code. Things like usernames, password, links to an api, and more shoul...
Vue.js JavaScript WebpackIn Vue computed properties are a life saver when it comes to being able to add logic to data that we need to use in the UI. We want to ke...
Vue.js JavaScriptUpdated Solution! Thanks for the post!If you don't want to create a web.config, you can also drive this through the <AspNetCoreHo...
asp.net asp.net coreI, Khalid Abuhakmeh, recently wrote about my [Razor Pages first impressions][khalid] and am mostly positive about the addition to the ASP...
asp.net asp.net core razorWe’re in the process of scaffolding out our Microsoft Azure environments using Terraform. While Terraform does an excellent job creating ...
Terraform OSSTL;DR Explicitly using SqlBulkCopy might never cause this problem since mapping is done manually, but NPoco’s usage does automatic map...
NPoco SqlBulkCopyWhile 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!
