avoid conflicts on releases branch

sinonjs · Apr 20, 2023 · 100991f · 100991f
1 parent b252475
commit 100991f
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/scripts/postversion.sh b/scripts/postversion.sh
@@ -18,6 +18,7 @@ fi
 # Now update the releases branch and archive the new release
 echo "archiving release from $SOURCE_BRANCH to $ARCHIVE_BRANCH"
 git checkout $ARCHIVE_BRANCH
+git pull # get latest to avoid conflicts!
 git merge --no-edit -m "Merge version $PACKAGE_VERSION" $SOURCE_BRANCH
 
 ./scripts/copy-documentation-for-new-release.sh $PACKAGE_VERSION