Eli Zaretskii <eliz@gnu.org> writes:
> From the shell prompt, "git pull" will fail if the changes are in the
> same file as one of those whose changes are brought in by the pull,
> but either using --rebase or maybe the stash/pull/unstash dance should
> take care of that, I guess?

There is also git pull --autostash

And if you use Mercurial, merge without conflict always works with
hg pull -u.

Best wishes,
Arne
-- 
Unpolitisch sein
heißt politisch sein,
ohne es zu merken.
draketo.de