Skip to content

Add MergeMode for toggling highlighting of merge conflicts #218

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

Open
LucaBernstein wants to merge 8 commits into
base: main
Choose a base branch
from

Add defaults for LandscapeKitConfig

38709af
Select commit
Loading
Failed to load commit list.
Open

Add MergeMode for toggling highlighting of merge conflicts #218

Add defaults for LandscapeKitConfig
38709af
Select commit
Loading
Failed to load commit list.
GitGuardian / GitGuardian Security Checks succeeded Apr 14, 2026 in 32s

No secrets detected ✅

8 commits were scanned without uncovering any secrets.

Details

Commits scanned: 8

  • Pull request #218: modifications-merge-conflict-handling 👉 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