Skip to content

fix(devops): add post-commit auto-heal for stash-pop conflicts (#2416)#2486

Merged
mrveiss merged 1 commit intoDev_new_guifrom
fix/issue-2416
Mar 26, 2026
Merged

fix(devops): add post-commit auto-heal for stash-pop conflicts (#2416)#2486
mrveiss merged 1 commit intoDev_new_guifrom
fix/issue-2416

Conversation

@mrveiss
Copy link
Owner

@mrveiss mrveiss commented Mar 26, 2026

Closes #2416

Summary

  • Added scripts/hooks/post-commit that detects conflict markers left by pre-commit stash/pop
  • Automatically restores files from HEAD when conflicts detected
  • Added install-post-commit entry in .pre-commit-config.yaml (mirrors existing install-post-checkout pattern)

Test plan

  • Script passes bash -n syntax check
  • install-post-commit hook runs successfully during commit
  • No-op when no conflicts exist

@mrveiss mrveiss merged commit cca0f1a into Dev_new_gui Mar 26, 2026
2 of 4 checks passed
@mrveiss mrveiss deleted the fix/issue-2416 branch March 26, 2026 19:28
@github-actions
Copy link

✅ SSOT Configuration Compliance: Passing

🎉 No hardcoded values detected that have SSOT config equivalents!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant