What's this feature called..?
Go to Tortoise, settings, Git > Remote, add an 'original' remote, with my repo's URL, then pull changes from there into your local repo, and see if you get a 'merge' in the log or not. If you don't, then maybe you can later push to your repo and be done with it. If you get a merge, try doing a git rebase, then the next time you update, do it through 'git pull --rebase original:master', instead of 'git pull original:master'. I'm sure the latter will do the trick, and will remove any merging artefacts, and thus should allow you to commit your branches without any trouble.
Another alternative might be to 'simply' never update your remote repo with mine, and... well, see if it's working when you attempt to do your pull request. I dunno.
It's important for me to get it right, so that I can direct people to the same method you'll be using. I have no problems with merging on the official repo, as long as it's not too obvious. I'm still on the fence when it comes to my very own, particular situation: I should probably have my own personal remote repo, and do pull requests for my stuff, and then have other people review my commits, or alternatively, push to the official repo only when people say that my own personal repo is working fine for them, etc.
Could, basically, be that the official repo is the stable branch, and my repo is my official dev branch.
Of course, I could also have two branches on the official repo, but... Well, I'm still not into branches. Anything that forces me to stash my work every now and then isn't gonna work for me, at least until I'm really desperate to 'simplify' my workflow. (Ahem!)
Nope, it's not working... :-/
But don't bother, though. I'd already made the change on my local repo, so the renaming was going to be in the next commit either way.
If they have a problem with that, they can always rename their country to Deutschland... Oh, it's already taken? ::)
No, seriously, it's not a matter of nationalities. I just do NOT want to make things complicated to users. Believe me, I've spent enough time wondering whether I should have the main language file called 'English', or 'English (US)'. And I'm still not sure about my decision.