# Fix merge conflicts jumping \(\#28508\) · gitcafe/zed

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

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

Visibility: public

Requested revision: 8ab25e2bac2fcfff3d413024d8154cd3dd3f3dea

Requested commit: 8ab25e2bac2fcfff3d413024d8154cd3dd3f3dea

Commit: 8ab25e2bac2fcfff3d413024d8154cd3dd3f3dea

Tree: 13c02d929431ae6767d8c20fa5d45846d33d2c9c

Author: Cole Miller

Committer: GitHub

## Message

```
Fix merge conflicts jumping (#28508)

This regressed in #27568, oops.

Release Notes:

- Fixed a bug causing conflicted files in the git panel to jump to the
"Tracked" section as soon as they were staged.
```

## Parents

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

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