prizmkit 1.0.90 → 1.0.91
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/bundled/VERSION.json
CHANGED
|
@@ -93,6 +93,13 @@ branch_merge() {
|
|
|
93
93
|
local auto_push="${4:-0}"
|
|
94
94
|
|
|
95
95
|
# Step 1: Checkout original branch
|
|
96
|
+
# First commit any remaining dirty files so checkout is not blocked
|
|
97
|
+
local remaining_dirty
|
|
98
|
+
remaining_dirty=$(git -C "$project_root" status --porcelain 2>/dev/null || true)
|
|
99
|
+
if [[ -n "$remaining_dirty" ]]; then
|
|
100
|
+
git -C "$project_root" add -A 2>/dev/null || true
|
|
101
|
+
git -C "$project_root" commit --no-verify -m "chore: include pipeline state artifacts" 2>/dev/null || true
|
|
102
|
+
fi
|
|
96
103
|
if ! git -C "$project_root" checkout "$original_branch" 2>/dev/null; then
|
|
97
104
|
log_error "Failed to checkout $original_branch for merge"
|
|
98
105
|
return 1
|