From 63b9b15416d783cac248eaf4a302bd1df34182b7 Mon Sep 17 00:00:00 2001 From: AIPass Date: Tue, 31 Mar 2026 16:42:49 -0700 Subject: [PATCH] feat(system): fix: exclude STATUS.md from system-pr staging to prevent rebase conflicts (#164) Co-authored-by: @devpulse --- src/aipass/drone/apps/plugins/devpulse_ops/pr_plugin.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/aipass/drone/apps/plugins/devpulse_ops/pr_plugin.py b/src/aipass/drone/apps/plugins/devpulse_ops/pr_plugin.py index 81fa3b07..d1299462 100644 --- a/src/aipass/drone/apps/plugins/devpulse_ops/pr_plugin.py +++ b/src/aipass/drone/apps/plugins/devpulse_ops/pr_plugin.py @@ -104,6 +104,13 @@ def create_system_pr(description: str, caller: str) -> dict: logger.error(result["message"]) return result + # Unstage STATUS.md — it's auto-synced by trigger events and + # including it causes rebase conflicts on every PR merge cycle. + subprocess.run( + ["git", "reset", "HEAD", "STATUS.md"], + capture_output=True, text=True, cwd=str(repo_root), + ) + # Step 4: Check if anything was staged diff_check = subprocess.run( ["git", "diff", "--cached", "--quiet"],