Git: auto-stashing to avoid conflicts on pull

First, decide if you want to pull with rebase. There are some implications of changing this, so think before you do it.

If you do, you can tell git to stash automatically before pulling:

Copygit config --global rebase.autoStash true

Now on pull, git will a) stash, b) pull and c) reapply your working tree. Note that applying your changes may lead to unresolvable conflicts!

Further see a common git config with this configuration enabled.