Zero Bug Build » Git

Confused about what is LOCAL and REMOTE in a git rebase?

James World — Fri, 11 Nov 2016 19:12:20 +0000

People often find the LOCAL and REMOTE sides in rebases and merges confusing. I put together a repository and README to explain what’s going on, and why the sides flip for a rebase. Find out more here: https://github.com/james-world/merge-view/blob/master/README.md

Hosting an OWIN WebApi in IIS, Console and Integration Tests

James World — Fri, 14 Nov 2014 12:21:06 +0000

One class library defining an OWIN based WebAPI, re-used by IIS, SelfHost and in-memory integration test projects. https://github.com/james-world/owinmultihosting

Uploading an existing local git repo to a new github/bitbucket repo.

James World — Mon, 06 Oct 2014 11:17:20 +0000

Note to self: Bitbucket and Github’s instructions for uploading an existing local repo have this instruction:

git remote add origin

But something in my set-up (posh-git?) adds a default origin entry causing this to fail with:

fatal: remote origin already exists

To fix this use:

git remote set-url origin

And then upload as normal with:

git push -u origin

Maybe this post will prevent me having to look this up every time I run into it!