METRON-1633 Incorrect instructions when merging PR into feature branch

[nickwallen]

Description

The 'dev-utilities/committer-utils/prepare-commit' script can be used to merge PRs against a feature branch. The script automatically determines which branch the PR should be merged into based on how the contributor submitted the PR.
Instructions are offered at the end of the script, after the local merge has completed. These instructions are incorrect when merging into a feature branch.

When merging into a feature branch, the instructions say...

Review commit carefully then run...
    cd /Users/nallen/tmp/metron-pr1056
    git push upstream master

But they should say...

Review commit carefully then run...
    cd /Users/nallen/tmp/metron-pr1056
    git push upstream feature/METRON-1416-upgrade-solr

Testing

Test merge a PR against a feature branch using a PR like #1056...

$ ./dev-utilities/committer-utils/prepare-commit
  ...using settings from /Users/nallen/.metron-prepare-commit
    [1] metron
    [2] metron-bro-plugin-kafka
  which repo? [1]:
  pull request: 1056
  local working directory [/Users/nallen/tmp/metron-pr1056]:
  origin repo [https://github.com/apache/metron]:
  base branch to merge into [feature/METRON-1416-upgrade-solr]:
   ...
  github contributor's username [nickwallen]:
  github contributor's email [nick@nickallen.org]:
  issue identifier in jira [METRON-1609]:
  issue description [Elasticsearch settings in Ambari should not be required if Solr is the indexer]:
  commit message [METRON-1609 Elasticsearch settings in Ambari should not be required if Solr is the indexer (nickwallen) closes apache/metron#1056]:

Squash commit -- not updating HEAD
Automatic merge went well; stopped before committing as requested
On branch feature/METRON-1416-upgrade-solr
Your branch is up to date with 'upstream/feature/METRON-1416-upgrade-solr'.

nothing to commit, working tree clean

  run test suite? [yN]

Review commit carefully then run...
    cd /Users/nallen/tmp/metron-pr1056
    git push upstream feature/METRON-1416-upgrade-solr

Test a merge against master using a PR like #1069.

$ ./dev-utilities/committer-utils/prepare-commit
  ...using settings from /Users/nallen/.metron-prepare-commit
    [1] metron
    [2] metron-bro-plugin-kafka
  which repo? [1]:
  pull request: 1069
  local working directory [/Users/nallen/tmp/metron-pr1069]:
  origin repo [https://github.com/apache/metron]:
  base branch to merge into [master]:
   ...
  github contributor's username [nickwallen]:
  github contributor's email [nick@nickallen.org]:
  issue identifier in jira [METRON-1624]:
  issue description [Set Profiler and Enrichment batch parameters in Ambari]:
  commit message [METRON-1624 Set Profiler and Enrichment batch parameters in Ambari (nickwallen) closes apache/metron#1069]:

Squash commit -- not updating HEAD
Automatic merge went well; stopped before committing as requested
[master 31e3bd18] METRON-1624 Set Profiler and Enrichment batch parameters in Ambari (nickwallen) closes apache/metron#1069
 Author: nickwallen <nick@nickallen.org>
 5 files changed, 88 insertions(+), 1 deletion(-)


 .../src/main/resources/common-services/METRON/CURRENT/configuration/metron-enrichment-env.xml      | 12 ++++++++++++
 .../src/main/resources/common-services/METRON/CURRENT/configuration/metron-profiler-env.xml        | 12 ++++++++++++
 .../src/main/resources/common-services/METRON/CURRENT/package/scripts/metron_service.py            | 20 ++++++++++++++++++++
 .../src/main/resources/common-services/METRON/CURRENT/package/scripts/params/params_linux.py       |  4 ++++
 .../ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/themes/metron_theme.json | 41 ++++++++++++++++++++++++++++++++++++++++-
 5 files changed, 88 insertions(+), 1 deletion(-)


31e3bd18 (HEAD -> master) METRON-1624 Set Profiler and Enrichment batch parameters in Ambari (nickwallen) closes apache/metron#1069


  run test suite? [yN]


Review commit carefully then run...
    cd /Users/nallen/tmp/metron-pr1069
    git push upstream master

Pull Request Checklist

• Is there a JIRA ticket associated with this PR? If not one needs to be created at Metron Jira.

• Does your PR title start with METRON-XXXX where XXXX is the JIRA number you are trying to resolve? Pay particular attention to the hyphen "-" character.

• Has your PR been rebased against the latest commit within the target branch (typically master)?

• Have you included steps to reproduce the behavior or problem that is being changed or addressed?

• Have you included steps or a guide to how the change may be verified and tested manually?

• Have you ensured that the full suite of tests and checks have been executed in the root metron folder via:

• Have you written or updated unit tests and or integration tests to verify your changes?

• If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under ASF 2.0?

• Have you verified the basic functionality of the build by building and running locally with Vagrant full-dev environment or the equivalent?

[justinleet]

+1 by inspection, good catch