wiki
>
git
>
stash
git stash
can be used to avoid conflicts on an incoming pull
afterwards
git stash pop
and
git commit