# Enable merge conflict parsing for currently-unmerged files \(\#31549\) · gitcafe/zed

[View on GitCafe](https://git.cafe/gitcafe/zed/commit/697c2ba71fa3d1d87e917b75bcee605a9447c4b2)

Repository: [gitcafe/zed](https://git.cafe/gitcafe/zed)

Visibility: public

Requested revision: 697c2ba71fa3d1d87e917b75bcee605a9447c4b2

Requested commit: 697c2ba71fa3d1d87e917b75bcee605a9447c4b2

Commit: 697c2ba71fa3d1d87e917b75bcee605a9447c4b2

Tree: 6c14774e325e5de20540a95142f5310fa8ad429b

Author: Max Brunsfeld

Committer: GitHub

## Message

```
Enable merge conflict parsing for currently-unmerged files (#31549)

Previously, we only enabled merge conflict parsing for files that were
unmerged at the last time a change was detected to the repo's merge
heads. Now we enable the parsing for these files *and* any files that
are currently unmerged.

The old strategy meant that conflicts produced via `git stash pop` would
not be parsed.

Release Notes:

- Fixed parsing of merge conflicts when the conflict was produced by a
`git stash pop`
```

## Parents

- [f54c0570012e8ccdbe9e3c2f6ea81c31a6b3edf4](https://git.cafe/gitcafe/zed/commit/f54c0570012e8ccdbe9e3c2f6ea81c31a6b3edf4?format=markdown)

[Source at this commit](https://git.cafe/gitcafe/zed/tree/697c2ba71fa3d1d87e917b75bcee605a9447c4b2?format=markdown)