Skip to content

Commit 3169f16

Browse files
committed
Use git reset --hard origin/production to get the production branch without merge commits.
1 parent f82cbfb commit 3169f16

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

www/www.reactos.org/rosweb/github-production-webhook-worker.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ while true; do
1717
# Start from a clean sheet and update to the latest production branch in Git.
1818
cd /srv/web-content_git_repo
1919
git clean -d -f -f
20-
git reset --hard
2120
git checkout production
22-
git pull
21+
git fetch
22+
git reset --hard origin/production
2323

2424
# Build the production website.
2525
sed -i "s#baseURL = \".*\"#baseURL = \"https://reactos.org/\"#" config.toml

0 commit comments

Comments
 (0)