Restore complete parent sources in local integration resolution

Browse Source

Reconstruct conflicted files from immutable parents and apply only line-bounded additive resolutions. Keep this unpublished integration correction visible in history.

Co-Authored-By: Paperclip <noreply@paperclip.ing>

...

This commit is contained in:

DottaandPaperclip committed 2026-10-30 18:17:28 -05:00

1 parent 94ddb74c0c

commit a836109fb0

10 files changed

+25029

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

server/src/services/issues.ts

+14119

File diff suppressed because it is too large. Load diff