nthfuncx/nanoclaw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: auto-resolve package-lock/badge/version conflicts in fork sync

Browse Source 
The fork-sync and merge-forward workflows were failing on every run
because package-lock.json, package.json (version), and badge.svg
always conflict between upstream and forks. These are always safe to
take from upstream/main. Now auto-resolves these trivial conflicts
and only fails on real code conflicts.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
gavrielc
2026-03-25 00:39:20 +02:00
parent 57e520c7e1
commit bf9b7d0311
2 changed files with 68 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
.github/workflows/fork-sync-skills.yml vendored
View File

@@ -62,14 +62,34 @@ jobs:
# Merge upstream main into fork's main
if ! git merge upstream/main --no-edit; then
echo "::error::Failed to merge upstream/main into fork main — conflicts detected"
# Auto-resolve trivial conflicts (lockfile, badge, package.json version)
CONFLICTED=$(git diff --name-only --diff-filter=U)
AUTO_RESOLVABLE=true
for f in $CONFLICTED; do
case "$f" in
package-lock.json|package.json|repo-tokens/badge.svg)
git checkout --theirs "$f"
git add "$f"
;;
*)
AUTO_RESOLVABLE=false
;;
esac
done
if [ "$AUTO_RESOLVABLE" = false ]; then
echo "::error::Failed to merge upstream/main into fork main — non-trivial conflicts detected"
git merge --abort
echo "synced=false" >> "$GITHUB_OUTPUT"
echo "sync_failed=true" >> "$GITHUB_OUTPUT"
exit 0
fi
# Validate build
git commit --no-edit
echo "Auto-resolved lockfile/badge/version conflicts"
fi
# Regenerate lockfile to match merged package.json
npm ci
if ! npm run build; then
echo "::error::Build failed after merging upstream/main"
@@ -115,11 +135,28 @@ jobs:
git checkout -B "$BRANCH" "origin/$BRANCH"
if ! git merge main --no-edit; then
# Auto-resolve trivial conflicts
CONFLICTED=$(git diff --name-only --diff-filter=U)
CAN_AUTO=true
for f in $CONFLICTED; do
case "$f" in
package-lock.json|package.json|repo-tokens/badge.svg)
git checkout --theirs "$f"
git add "$f"
;;
*)
CAN_AUTO=false
;;
esac
done
if [ "$CAN_AUTO" = false ]; then
echo "::warning::Merge conflict in $BRANCH"
git merge --abort
FAILED="$FAILED $SKILL_NAME"
continue
fi
git commit --no-edit
fi
# Check if there's anything new to push
if git diff --quiet "origin/$BRANCH"; then

17
.github/workflows/merge-forward-skills.yml vendored
View File

@@ -52,11 +52,28 @@ jobs:
# Attempt merge
if ! git merge main --no-edit; then
# Auto-resolve trivial conflicts
CONFLICTED=$(git diff --name-only --diff-filter=U)
CAN_AUTO=true
for f in $CONFLICTED; do
case "$f" in
package-lock.json|package.json|repo-tokens/badge.svg)
git checkout --theirs "$f"
git add "$f"
;;
*)
CAN_AUTO=false
;;
esac
done
if [ "$CAN_AUTO" = false ]; then
echo "::warning::Merge conflict in $BRANCH"
git merge --abort
FAILED="$FAILED $SKILL_NAME"
continue
fi
git commit --no-edit
fi
# Check if there's anything new to push
if git diff --quiet "origin/$BRANCH"; then