fix: force checkout main to avoid unstaged changes during rebase
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
parent
524792465f
commit
0d5b924f8b
|
|
@ -146,7 +146,7 @@ jobs:
|
||||||
git config user.email "actions@noreply.local"
|
git config user.email "actions@noreply.local"
|
||||||
cp manifest.json /tmp/manifest_updated.json
|
cp manifest.json /tmp/manifest_updated.json
|
||||||
git fetch origin main
|
git fetch origin main
|
||||||
git checkout main
|
git checkout -f main
|
||||||
git pull --rebase origin main
|
git pull --rebase origin main
|
||||||
cp /tmp/manifest_updated.json manifest.json
|
cp /tmp/manifest_updated.json manifest.json
|
||||||
git add manifest.json
|
git add manifest.json
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue