fix(conflict): deterministic JSON merge + --theirs fallback (no more story thrash)#106
Merged
Merged
GitGuardian / GitGuardian Security Checks
succeeded
Jun 25, 2026 in 1s
No secrets detected ✅
1 commit was scanned without uncovering any secrets.
Details
Commit scanned: 1
- Pull request #106:
fix/conflict-resolver-deterministic👉main
🦉 GitGuardian detects secrets in your source code to help developers and security teams secure the modern development process. You are seeing this because you or someone else with access to this repository has authorized GitGuardian to scan your pull request.
Loading