How to pull with a dirty work tree
If the remote changes do not overlap with the local ones, there is no need to
stash, pull, and un-stash. Instead, in magit-status:
- Fetch (
f p) the remote changes. - Commit the local changes as normal (
c c). - Pull (
F p) to merge the fetched changes. - Push (
P p).