Merge pull request #19 from NarrativeScience/custom-commit-message-merge-branch-3

Move force logic after merge not commit

Author: ns-bdesimone

.circleci/config.yml

@@ -3,7 +3,7 @@ version: 2.1
 orbs:
   # dev version needs to be manually deployed to accurately test commit changes.
   # Once deployed, update <alpha> to reflect the version deployed.
-  ghpr: narrativescience/ghpr@dev:1.1.4
+  ghpr: narrativescience/ghpr@dev:1.1.5
 
 commands:
   pack-validate:

src/commands/build-prospective-branch.yml

@@ -24,8 +24,12 @@ steps:
         git config --global user.name "$GITHUB_USERNAME"
         # Merge the branch with no commit and then create a custom commit message contianing the original commit message.
         git fetch && git merge "origin/$GITHUB_PR_BASE_BRANCH" --no-commit
-        git commit -am "Merging ${GITHUB_PR_BASE_BRANCH} into ${CIRCLE_BRANCH}. ${GITHUB_PR_COMMIT_MESSAGE}"
         if [[ $? -ne 0 && << parameters.force >> == false ]]; then
           echo "Failed to merge $GITHUB_PR_BASE_BRANCH into $CIRCLE_BRANCH"
           exit 1
         fi
+        git commit -am "Merging ${GITHUB_PR_BASE_BRANCH} into ${CIRCLE_BRANCH}. ${GITHUB_PR_COMMIT_MESSAGE}"
+        if [[ $? -ne 0 ]]; then
+          echo "Commmit failed... nothing to commit...Continue anyway."
+          exit 0
+        fi