Clean up comments and rename resolveConflictsSimple to resolveOverlaps
authorStefan Gasser <redacted>
Fri, 16 Jan 2026 16:14:37 +0000 (17:14 +0100)
committerStefan Gasser <redacted>
Fri, 16 Jan 2026 16:14:37 +0000 (17:14 +0100)
commitabd2c85e68969e56e579432edc0ba4e072496a23
tree883a6c8928b900c3e805ced8453b8cc229e40438
parentdbb221a2130e1a97518d7a39abc75d4733873758
Clean up comments and rename resolveConflictsSimple to resolveOverlaps
src/secrets/redact.ts
src/utils/conflict-resolver.test.ts
src/utils/conflict-resolver.ts
git clone https://git.99rst.org/PROJECT