Git: "Take ours" does not always work when only ours is taken in a file

[mangoleaf]

Summary

Selecting "Take ours" for all conflicts in a file is causing the diff to disappear, but then later reappear with the same conflict again that I have already resolved.

Description

Steps to trigger the problem:

1. Create a merge conflict (make sure there are a few files)
2. Select "Take ours" for all conflicts within a file
3. As you continue going down the list, the file will come back with conflicts that you had thought you had resolved

Note: I am running into this while trying to solve a large merge conflict, 50+ files.

Actual Behavior: No operation performed from using all "Take ours" Expected Behavior: The conflict is resolved and staged after the last "Take ours" for the file

Zed Version and System Specs

Zed: v0.187.4 (Zed) OS: macOS 15.3.1 Memory: 24 GiB Architecture: aarch64