Resolve conflicts by preferring remote changes

Browse Source

...

This commit is contained in:

g1nation

2026-05-14 21:58:59 +09:00

parent 0004853fcf

commit 05d05a392c

12 changed files with 1237 additions and 837 deletions

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

.astra/project-context/scan-cache.json

+752 -780

File diff suppressed because it is too large Load Diff