Provide option to stop loading a diff if it takes too long

9 votes

I have some large JSON metadata files that, when resolving merge conflicts, cause the diff view in GK to load until it crashes.

I know that the "mark as resolved" button effectively eliminates this, but when I'm going through several merge conflicts, it's easy to forget, doubleclick the marked file, and then crash my GK. Maybe a "File is too large to load diff..." or allowing the checkboxes in the split diff view to function regardless of if the diff is loaded?

Under consideration Suggested by: meta-434 Upvoted: 29 Sep, '23 Comments: 2

Comments: 2