Skip to content

Commit

Permalink
Add detail to README about comment option on git integrate
Browse files Browse the repository at this point in the history
  • Loading branch information
chris-nelson-mn committed Nov 16, 2015
1 parent ba8fa8f commit 31024fe
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ update the local feature branch with latest remote changes plus upstream release

integrate the current feature branch into an aggregate branch (ex: prototype, staging)

options:
* `--comment` or `-c` = Add a comment about the integration to an existing PR for the working branch. Create a new PR for that branch if one does not exist.
* `--resume` or `-r` = Resume integration after resolving a merge conflict on the aggregate branch.

## git review <feature_branch_name (optional, default: current_branch)>

create a pull request on github for peer review of the current branch. This command is re-runnable
Expand Down

0 comments on commit 31024fe

Please sign in to comment.