Do you want to save 80% of your bandwidth to your search provider? Do you want to deliver content to your users faster? With this one tr...
Development Elasticsearch DebuggingWe operate in a typical QA -> Production workflow on both our front-end and back-end teams. So, what happnes when your front-end is in...
Development JavaScript Dev Ops Vue Vue.js JekyllIf you’re not familiar, or just haven’t used Sass maps, here’s your chance to dive in. Our latest static site was built on Jekyll using ...
sassIn JavaScript, we are always working with different data types to send to the API or display on the UI. Cloning and altering that clone i...
JavaScriptC# being an Object Oriented Programming (OOP) language, we have access to inheritance. Like any feature of a programming language, you sh...
csharp bugsWe love the combination of SQL and Elasticsearch and believe it is a winning combination for anyone building a modern application. Elasti...
Elasticsearch NEST C#I’ve been watching [DotNetConf][dotnetconf] videos over the weekend, and was most curious about [Mads Torgersen’s][mads] [“What’s Coming ...
c-sharp C# .NETHugo is an amazing static site generator, but getting lost when templating is easier than we’d like. We’ve found a way to evaluate variab...
Hugo JAMStack StaticRegardless of your opinion on Object Relational Mappers (ORM), I think they are a great tool for prototyping ideas. Over time, they can l...
.net core sqlDealing with JSON data in SQL Database introduces several challenges. This post addresses querying json data stored in SQL Database that...
SQL Azure Database developmentWe are in the middle of writing a template engine to define dynamic forms. The user interface can only post to a known model on the serve...
C# developmentWe are living on the bleeding edge that is Hugo’s release cycle. To keep our macOS development environments up to date we wrote this shel...
developmentHugo recently released an amazing asset pipeline, which means you need less external dependencies to build a sweet static site. To take a...
dev buildI 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 SQLWhile 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!
