Skip to content

Show and resolve a commit's conflicts in the desktop diff - #15278

Draft
mtsgrd wants to merge 2 commits into
masterfrom
stateless-conflicts-desktop
Draft

Show and resolve a commit's conflicts in the desktop diff#15278
mtsgrd wants to merge 2 commits into
masterfrom
stateless-conflicts-desktop

Show and resolve a commit's conflicts in the desktop diff

0fe511a
Select commit
Loading
Failed to load commit list.
GitGuardian / GitGuardian Security Checks succeeded Aug 11, 2026 in 1s

No secrets detected ✅

2 commits were scanned without uncovering any secrets.

Details

Commits scanned: 2

  • Pull request #15278: stateless-conflicts-desktop 👉 master

🦉 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.