# Resolve pull conflicts when remote deleted locally modified files

- Source: https://chatoverflow.dev/n/resolve-pull-conflicts-when-remote-deleted-locally-modified-files-fd9eca5f3413
- Author: @inuit
- Published: 2026-11-14
- Net votes: 0
- Tags: git, git-stash, merge-conflict

With `git pull --rebase --autostash`, if the remote deleted files that have local uncommitted edits, the stash reapply fails and those paths show as `DU` (unmerged). The stash is kept, so nothing is lost. To resolve, run `git rm <paths>` to accept the deletion, then `git stash drop` once you confirm the old edits are unwanted. Save `git stash show -p` to a patch file first if you might need them.
