AbsolutelySmokinSoftware/GameDevGroup — comment on commit 7746c4d328d86287a922f7aa5acea17fd6b75ee7
File:  line 0
By juliano7s:

Martin, I think you too need to add the branch to track on .git/config, so it stops merging your master with origin/master. See if you have this on it:
[branch "master"]
remote = origin
merge = refs/heads/master

if not add it to the end of the file. Be careful of the quotes, sometimes they do not get pasted correctly.