Finishing feature closes Github pull request

9 views
Skip to first unread message

Rob Oaks

unread,
Nov 17, 2017, 2:11:36 PM11/17/17
to SmartGit
First, note that we make strict use of SG's git-flow support. Given that fact, here's the workflow we follow for Github PRs:
  1. Create a feature branch for the PR
  2. Make the changes
  3. Commit and push the feature
  4. Create a PR from within SG (right-click the feature branch in Log view) (setup to merge feature to develop as usual)
  5. Standard review/modify cycle where reviewer makes comments, author makes changes and pushes, etc.
  6. Approval received
  7. Finish feature. As usual, with git-flow, this merges the feature into develop and then deletes the feature branch. 
  8. SG closes the PR, This wrong. It should not close the PR (which signifies an abandoned PR) but, rather, should simply perform the merge and leave the PR on Github in the merged state.

Why is this happening?

syntevo Support

unread,
Nov 19, 2017, 6:37:23 AM11/19/17
to smar...@googlegroups.com
> First, note that we make strict use of SG's git-flow support. Given that
> fact, here's the workflow we follow for Github PRs:
>
> 1. Create a feature branch for the PR
> 2. Make the changes
> 3. Commit and push the feature
> 4. Create a PR from within SG (right-click the feature branch in Log
> view) (setup to merge feature to develop as usual)
> 5. Standard review/modify cycle where reviewer makes comments, author
> makes changes and pushes, etc.
> 6. Approval received
> 7. Finish feature. As usual, with git-flow, this merges the feature into
> develop and then deletes the feature branch.
> 8. *SG closes the PR*, This wrong. It should not close the PR (which
> signifies an abandoned PR) but, rather, should simply perform the merge and
> leave the PR on Github in the merged state.

I can reproduce this behavior. Due to the nature of Git-Flow it's expected. I've summarized the problem and a possibly workaround here:

https://www.syntevo.com/doc/display/SG/GitHub+integration#GitHubintegration-Git-FlowPullRequestswillbeclosedonFinishFeature

--
Best regards,
Marc Strapetz
syntevo GmbH
http://www.syntevo.com



11/17/2017 20:12 - Rob Oaks wrote:

> First, note that we make strict use of SG's git-flow support. Given that
> fact, here's the workflow we follow for Github PRs:
>
> 1. Create a feature branch for the PR
> 2. Make the changes
> 3. Commit and push the feature
> 4. Create a PR from within SG (right-click the feature branch in Log
> view) (setup to merge feature to develop as usual)
> 5. Standard review/modify cycle where reviewer makes comments, author
> makes changes and pushes, etc.
> 6. Approval received
> 7. Finish feature. As usual, with git-flow, this merges the feature into
> develop and then deletes the feature branch.
> 8. *SG closes the PR*, This wrong. It should not close the PR (which
> signifies an abandoned PR) but, rather, should simply perform the merge and
> leave the PR on Github in the merged state.
>
>
> Why is this happening?
>
> --
> You received this message because you are subscribed to the Google Groups
> "SmartGit" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to
> smartgit+u...@googlegroups.com.
> To post to this group, send email to smar...@googlegroups.com.
> To view this discussion on the web visit
> https://groups.google.com/d/msgid/smartgit/bd30a247-5ee9-492c-81aa-13408ed8089c%40googlegroups.com.
> For more options, visit https://groups.google.com/d/optout.
>
Reply all
Reply to author
Forward
0 new messages