git: Fix conflicted paths not getting cleared#50327
Conversation
| } | ||
| } | ||
| } | ||
| RepositoryEvent::BranchChanged | RepositoryEvent::MergeHeadsChanged => { |
There was a problem hiding this comment.
Not sure if this is intended, but removing this event will break the auto update of the graph for new commits. Just wanted to point it out.
There was a problem hiding this comment.
I think BranchChanged is also emitted when the HEAD commit moves, right? Was MergeHeadsChanged picking up any situation where HEAD hasn't changed but we do want to update the graph?
There was a problem hiding this comment.
Yeah it should be emitted! But i had a case where it wasn't but the graph should been updated. But I can't remember the exact case, tried testing what I tested back then but can't reproduce it anymore. So you can probably ignore my comment :)
There was a problem hiding this comment.
👍 one thing that I'm sure we don't catch with the current setup is when you do a fetch and remote branches update, I would be down to emit an event in that case so the git graph knows to rebuild (if it shows remote branches). And happy to add another event to replace this one if it turns out the graph needs it
There was a problem hiding this comment.
Yeah your right we don't update on remote change yet. Happy to look into that if you haven't done it already.
Before you mark this PR as ready for review, make sure that you have: - [ ] Added a solid test coverage and/or screenshots from doing manual testing - [ ] Done a self-review taking into account security and performance aspects - [ ] Aligned any UI changes with the [UI checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) Release Notes: - Fixed a bug where files would still be marked as having git conflicts after resolving them. --------- Co-authored-by: Bennet Bo Fenner <bennetbo@gmx.de>
Before you mark this PR as ready for review, make sure that you have:
Release Notes: