fix: git pull fast-forward before pushing

.github/workflows/package-version-creation.yml

@@ -51,6 +51,7 @@ jobs:
           git status
           git config --global user.name 'GitHub Actions'
           git config --global user.email '[email protected]'
+          git config pull.ff only
           git pull origin "${{ github.head_ref }}"
           git add force-app/main/default/classes/AdyenOMSConstants.cls sfdx-project.json
           # Check if any of the files have been modified before committing

scripts/update-app-info-version.sh

@@ -18,16 +18,16 @@ PROJECT_LIBRARY_VERSION=$(yq -r '.packageDirectories[].dependencies[]? | select(
 APEX_OMS_VERSION=$(awk -F"[']" '/MERCHANT_APP_VERSION_FOR_APP_INFO/ {print $2}' "$APEX_FILE")
 APEX_LIBRARY_VERSION=$(awk -F"[']" '/ADYEN_LIBRARY_VERSION_FOR_APP_INFO/ {print $2}' "$APEX_FILE")
 
+echo
 # Print the branch name
 echo "Branch: $BRANCH_NAME"
-
 # Print the headers for better comparison
 printf "%-25s %-25s\n" "sfdx-project.json VERSION" "AdyenOMSConstants VERSION"
 printf "%-25s %-25s\n" "-------------------------" "-------------------------"
-
 # Print the OMS and Library versions in a pretty format
 printf "%-25s %-25s\n" "$PROJECT_OMS_VERSION (OMS)" "$APEX_OMS_VERSION (OMS)"
 printf "%-25s %-25s\n" "$PROJECT_LIBRARY_VERSION (Library)" "$APEX_LIBRARY_VERSION (Library)"
+echo
 
 # Check if BASE_VERSION matches PROJECT_OMS_VERSION
 if [ "$BRANCH_VERSION" != "$PROJECT_OMS_VERSION" ]; then