Skip to content

Commit

Permalink
Merge pull request #156 from Piedone/patch-3
Browse files Browse the repository at this point in the history
Adding missing git prefix to accept-pr command example
  • Loading branch information
abhishekluv committed Mar 5, 2015
2 parents 366feb8 + d0e4171 commit 9eb8d2e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Documentation/Merging-Pull-Requests.markdown
Expand Up @@ -45,7 +45,7 @@ The parameters $2 and $3 can be found in the modal dialog which appears when cli
### Usage

```
accept-pr 1.8.x https://git01.codeplex.com/forks/jchenga/orchard issues/20797 $'#20797: Fixing taxonomy handler exception\n\nWork Item: 20797'
git accept-pr 1.8.x https://git01.codeplex.com/forks/jchenga/orchard issues/20797 $'#20797: Fixing taxonomy handler exception\n\nWork Item: 20797'
```

If this command results with an error, it's probably because the PR is too old and there are some merge conflicts. In this case reopen the PR by requesting the user to rebase his changes on the targeted branch or to merge the conflicts, clean you local changes, then try again.
Expand Down

0 comments on commit 9eb8d2e

Please sign in to comment.