If you have used slots in Vue, you know that it provides a clean way to vary content that is displayed in child components. For example, ...
VueJS Slots Scoped Slots JavaScriptWe’ve been using Swagger via Swashbuckle for some time with our ASP.NET Full Framework applications. As we’re moving toward ASP.NET Core ...
asp.net coreWe’ve spotted some strange behavior before with ASP.NET Core and JSON serialization/deserialization, and I eventually made it back to try...
asp.net coreWe’ve spotted some strange behavior before with ASP.NET Core and JSON serialization/deserialization, and I eventually made it back to try...
asp.net coreAs we create CSS components in our internal framework, we typically try to use little if no JS. Our tooltips should be no different. We...
UI/UX frontend CSS Responsive DesignImagine you’re using Elasticsearch with your strongly typed C# models and nameof(MyProperty) and wondering why it doesn’t work. Turns out...
.NETI have been working as a software developer for almost three years, the most common exception or bug I made is NullReferenceException -Sy...
.NET C#Testing is an important step we can take as developers to reduce bugs in our code, but testing seems to be one of the best practices that...
Vue.js Jest TestingLast week I attended the annual user experience conference Convey UX in Seattle, where 50 UX leaders from all over the world shared their...
UI/UX frontend conference conveyux2020 conveyuxWe run a number of web applications at Ritter Insurance Marketing. Our primary datastore for these applications is MSSQL / SQL Azure. Our...
SQLWe’ve been working through upgrading our core applications from ASP.NET full framework to ASP.NET Core. Over the years we’ve assembled an...
.NETConfigurationManager has long been used by .NET Framework developers prior to .NET Core to access things like app settings and connection...
.NETWe’ve had some internal discussion around the usage of RegexOptions.Compiled in .NET – how it works and when it’s appropriate to use it. ...
.NETDebugging 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...
SendGridWhile 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!
