[METRON-1633] Incorrect instructions when merging PR into feature branch

• Type: Bug
• Status: Done
• Priority: Minor
• Resolution: Done
• Fix Version/s: 0.6.0
• Assignee: Nick Allen
• Reporter: Nick Allen
• Created: 21/Jun/18 15:46
• Updated: 04/Sep/18 17:11
• Resolved: 21/Jun/18 20:58

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

Issue Links

• links to: GitHub Pull Request #1074