Skip to content

Commit

Permalink
ifxi
Browse files Browse the repository at this point in the history
  • Loading branch information
mattiaswal committed Jan 29, 2025
1 parent 2e96ea2 commit a2c4aed
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion .github/workflows/sync-infix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,11 @@ jobs:
else
git checkout -b latest
fi
else
if [ -n "$(git branch -r | grep latest)" ]; then
git reset --hard origin/latest
fi
fi
git reset --hard origin/latest
if [[ -n "$(git diff --exit-code origin/main)" ]]; then
echo "New commits exist on main"
git merge origin/main
Expand Down

0 comments on commit a2c4aed

Please sign in to comment.