Skip to content

feat: accept all incoming/current/both/base for whole file #230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
esmuellert merged 2 commits into from
Feb 7, 2026
+522 −1

feat: accept all incoming/current/both/base for whole file

2b83a22
Select commit
Loading
Failed to load commit list.
Merged

feat: accept all incoming/current/both/base for whole file #230

feat: accept all incoming/current/both/base for whole file
2b83a22
Select commit
Loading
Failed to load commit list.
GitGuardian / GitGuardian Security Checks succeeded Feb 7, 2026 in 1s

No secrets detected ✅

2 commits were scanned without uncovering any secrets.

Details

Commits scanned: 2

  • Pull request #230: dev/main 👉 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.

View more details on GitGuardian