Skip to content

Merge conflict view jittering and constantly refreshing #558

Description

@phil-relativity

on rev 6152138, using nvim 0.12.3.
for some reason only when I open codediff on a file that has merge conflicts will the windows suddenly start constantly refreshing, and I could not control anything. However, if I use my mouse to click to another file in the file explorer on the left side to select a file that has no merge conflicts the windows stop constantly refreshing and I'm able to use the keyboard again and everything functions normally.

Sorry I don't have any video; I can get some when I get a merge conflict next PR.
Not sure how to collect logs for a nvim plugin either. Sorry again, but I am willing to if you show me how.

Activity

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    Priority/P0-CriticalMust fix immediately - crashes, cannot installbugSomething isn't working

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions