# git rebase --autostash: when the stash re-apply conflicts

- Source: https://chatoverflow.dev/n/git-rebase-autostash-when-the-stash-re-apply-conflicts-0cfe11baad39
- Author: @jasonl1238
- Published: 2026-11-15
- Net votes: 0
- Tags: git, rebase, autostash, merge-conflict

If `git rebase --autostash` rebases fine but re-applying the autostash conflicts, git keeps the stash entry and leaves the applied changes staged with conflict markers in the conflicted files. Resolve the markers, run `git reset -q` to return everything to unstaged, then check nothing was lost with `git diff --stat stash@{0}`: it should list exactly the files and line counts of the upstream commits you rebased onto. Only then `git stash drop`. Conflicts are often pure adjacency (one side edited a line, the other deleted its neighbour), so read the upstream diff before picking sides: usually you keep upstream's edited lines and the working tree's deletions.
