-
Notifications
You must be signed in to change notification settings - Fork 281
Need to handle large merge conflicts more gracefully #5724
Copy link
Copy link
Open
Labels
Component: Merge ConflictIssue needs changes to merge conflict resolversIssue needs changes to merge conflict resolversEdition: UltimateEffort: MediumIssues require < 1 month of workIssues require < 1 month of workImpact: MediumIssue is impactful with a bad, or no, workaroundIssue is impactful with a bad, or no, workaroundState: Blocked (Issue)Issue is blocked on the resolution of another issueIssue is blocked on the resolution of another issue
Metadata
Metadata
Assignees
Labels
Component: Merge ConflictIssue needs changes to merge conflict resolversIssue needs changes to merge conflict resolversEdition: UltimateEffort: MediumIssues require < 1 month of workIssues require < 1 month of workImpact: MediumIssue is impactful with a bad, or no, workaroundIssue is impactful with a bad, or no, workaroundState: Blocked (Issue)Issue is blocked on the resolution of another issueIssue is blocked on the resolution of another issue
A performance optimization we made in the past was to truncate large diffs to avoid loading megabytes of JSON in the merge conflict resolver.
Once #5720 is done, we may be able to remove this limitation since we won't be operating on JSON for these objects anymore.