[jira] [Updated] (METRON-1633) Incorrect instructions when merging PR into feature branch
[ https://issues.apache.org/jira/browse/METRON-1633?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Nick Allen updated METRON-1633: --- Fix Version/s: (was: Next + 1) 0.6.0 > Incorrect instructions when merging PR into feature branch > -- > > Key: METRON-1633 > URL: https://issues.apache.org/jira/browse/METRON-1633 > Project: Metron > Issue Type: Bug >Reporter: Nick Allen >Assignee: Nick Allen >Priority: Minor > Fix For: 0.6.0 > > > 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... > {code} > Review commit carefully then run... > cd /Users/nallen/tmp/metron-pr1056 > git push upstream master > {code} > But they should say... > {code} > Review commit carefully then run... > cd /Users/nallen/tmp/metron-pr1056 > git push upstream feature/METRON-1416-upgrade-solr > {code} -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Updated] (METRON-1633) Incorrect instructions when merging PR into feature branch
[ https://issues.apache.org/jira/browse/METRON-1633?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Nick Allen updated METRON-1633: --- Fix Version/s: Next + 1 > Incorrect instructions when merging PR into feature branch > -- > > Key: METRON-1633 > URL: https://issues.apache.org/jira/browse/METRON-1633 > Project: Metron > Issue Type: Bug >Reporter: Nick Allen >Assignee: Nick Allen >Priority: Minor > Fix For: Next + 1 > > > 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... > {code} > Review commit carefully then run... > cd /Users/nallen/tmp/metron-pr1056 > git push upstream master > {code} > But they should say... > {code} > Review commit carefully then run... > cd /Users/nallen/tmp/metron-pr1056 > git push upstream feature/METRON-1416-upgrade-solr > {code} -- This message was sent by Atlassian JIRA (v7.6.3#76005)