Post #3064484

@thoralf Another option might be `git stash; git pull --ff-only; git stash drop`. Will still conflict if you pull a file that was newly created locally and remote at the same time, though, but that's probably unlikely. Also make sure that you are not in any conflict or merging mode at the moment. (E.g. `git merge --abort`)