Skip to content

Commit 574f418

Browse files
author
Fr4gm3nt3d_sh
committed
Update .github/workflows/llmcodereview.yml
1 parent 54f7710 commit 574f418

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

.github/workflows/llmcodereview.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,5 +124,10 @@ jobs:
124124
# Merge the fetched main into current branch (or create if it doesn't exist)
125125
git merge --allow-unrelated-histories pages/main -m "Merge reports" || true
126126
127+
# Resolve conflicts by keeping our version
128+
git checkout --ours report.html
129+
git add report.html
130+
git commit --no-edit || true
131+
127132
# Push to the target repo
128-
git push pages HEAD:main
133+
git push "https://x-access-token:${GH_PAGES_PAT}@github.com/Mod-Sauce/mod-sauce.github.io.git" HEAD:main

0 commit comments

Comments
 (0)