Cleanup new Github merge for next release

reenhanced / gitreflow

Reflow automatically creates pull requests, ensures the code review is approved, and squash merges finished branches to master with a great commit message template.

MIT License

1.49k stars 64 forks source link

Cleanup new Github merge for next release #172

Closed codenamev closed 8 years ago

codenamev commented 8 years ago

F.Y.I. All current releases of the gem are un-affected.

We are experiencing several UX issues, and bugs, with the new Github squash merge flow we introduced (on master). We are ironing them out now, and can use this as a way to stay updated.

[x] Using an editor other than VIM doesn't work
[x] Github's squash merge is not working (currently waiting on this for release)
[x] Delivery with Bitbucket (and deliver -f) no longer allows you to avoid push to remote
[x] Delivery with Bitbucket (and deliver -f) no longer works when not providing branch names
[x] Bitbucket PR creation is not adding a description
[x] All commands should use reflow's command line helper methods to run
[x] Remove request to open URLs in a browser
[x] Refactor 'puts' calls to use GitReflow.say instead

simonzhu24 commented 8 years ago

@codenamev Fix use of branch names during Bitbucket merge and force delivery merge I think is also the same problem that I fixed in my PR (I refactored poorly written ruby code to be a bit cleaner as well). 👍

simonzhu24 commented 8 years ago

@codenamev For some reason, I felt like I should write some comments on this, hope you don't mind ^_^

simonzhu24 commented 8 years ago

@codenamev Also, I just wanted to check in with you. Please let me know when we can release a new gem update with the newest changes! Thanks!

codenamev commented 8 years ago

@simonzhu24 We are still waiting on this pull request on the github_api before we can release, as the squash merge via Github API won't work without it.

simonzhu24 commented 8 years ago

It looks like it is ready to be merged!

On Fri, May 13, 2016 at 11:44 AM, Valentino notifications@github.com wrote:

@simonzhu24 https://github.com/simonzhu24 We are still waiting on this pull request on the github_api https://github.com/piotrmurach/github/pull/266 before we can release, as the squash merge via Github API won't work without it.

— You are receiving this because you were mentioned. Reply to this email directly or view it on GitHub https://github.com/reenhanced/gitreflow/pull/172#issuecomment-219127525

pboling commented 8 years ago

@codenamev The github api PR has been merged! What remains to be done here? Just updating the gemspec dependency on github_api?

reenhanced-asgard commented 8 years ago

Woohoo! Piotr has always been helpful.

Yep, I'll update the gem spec and release this morning :-)

Cheers, Valentino

On Sunday, May 22, 2016, Peter Boling <notifications@github.com javascript:_e(%7B%7D,'cvml','notifications@github.com');> wrote:

@codenamev https://github.com/codenamev The github api PR has been merged! What remains to be done here? Just updating the gemspec dependency on github_api?

— You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub https://github.com/reenhanced/gitreflow/pull/172#issuecomment-220872400

Cheers, Valentino

nhance commented 8 years ago

LGTM

nhance commented 8 years ago

lgtm