z-index Is Confusing, but It Doesn't Have to Be
CSS
Debugging web applications can be difficult sometimes. When debugging a failed HTTP GET request in Application Insights you have all of t...
.NETSupporting IE comes with challenges if you are using es6, and while babel helps greatly there is a few gotcheas. One of the main one is u...
JavaScript IE 11For a long time, we were dependent on the CSS frameworks of others – and we were quite happy. 😀 As our needs grew, we needed a framework...
Sass Dart SassAutofac is an inversion of control container for .NET. It allows developers to register items and then later use those registrations to i...
.NETWorking with dates can seem a little daunting sometimes. We need specific formatting, and hopefully we don’t have to deal with timezones ...
JavaScript Vue HTMLWe recently started using SendGrid to send emails in production. As part of that, we noticed that emails to outlook.com, hotmail.com, msn...
SendGridHave you found yourself getting lost in large Vue components that have multiple features? The Composition API is a new optional syntax in...
vue3 composition frontend developmentAccording to https://www.chromestatus.com/feature/5088147346030592 at the time of this blog post Chrome 80 is targeted to default cookies...
.NETOur RimDev.FeatureFlags library uses Newtonsoft.Json as part of roundtripping the on/off state in SQL. With that we use TypeNameHandling....
.NETI never thought ordering of relational static fields and properties in C# mattered. And, then, I started getting NREs on a property I kno...
C#.NET’s LINQ library has extension-methods that will return a default-value if not found in a collection. These are a great time-saver if ...
.NET LINQHow are we building our websites? Are they truly for everyone or if we ask ourselves honestly are they just for us? The way we currently ...
care performance UI/UX frontend developmentWorking with NPM packages locally can feel a little bit overwhelming at first. Over the last year, we have transitioned some of our infra...
npm tgzIn order to avoid having large files in our Git history we’ve been using Git Large File Storage (LFS). It commits a marker in the Git rep...
GitHow do you not overwhelm the user with a wall of content? When thinking about user experience, this question often comes to mind as we d...
UI/UX frontend SEOIf your idea of accessibility is making sure your site hits a specific WCAG score, you’re probably leaving out some users. Maybe accessib...
Accessibility UI/UX frontendAbout a year ago, RIMDev started a DevOps transformation. As part of that transformation, we started to use slots in Azure app services, ...
devops rimbot chatopsOver the previous year we’ve been working to improve our overall uptime. While we aren’t prepared to offer 99.999% availability in the wa...
Azure DevOpsOur starting point This past year we’ve been on a DevOps journey. While we haven’t been in a state of stagnation or chaos as a team, we’...
Azure DevOps TerraformWhile 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!