From 100991f92bdcddc3f93a606621260ce274e37070 Mon Sep 17 00:00:00 2001 From: Carl-Erik Kopseng Date: Thu, 20 Apr 2023 14:05:40 +0200 Subject: [PATCH] avoid conflicts on releases branch --- scripts/postversion.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/postversion.sh b/scripts/postversion.sh index 6e947363b..17fc2e9f2 100755 --- 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