My main question would be: can we disable merges in the ui and only constraint to rebase/fast-forward merges? I've found on other GitHub projects that the default behavior of merge makes an unintelligible history.
On Fri, May 19, 2017 at 11:59 AM, Julien Le Dem <jul...@dremio.com> wrote: > Thank you Justin for the investigation! > > I'd be very interested in being able to manage PRs > (rename/close/...) through the github UI. Which I understand this would > make possible. > We are already pushing to only one source since github is a read only > mirror. I think it would not be a problem to update our process and > possibly decide to push to only to github. > Uwe expressed interest in using the github UI to merge PRs. We would have > to figure out some other things we do like closing jiras in the merge > script. > Is there a JIRA integration that closes the ticket when the branch is > merged? > > I'm curious to hear others' thoughts on this. > > > On Wed, May 17, 2017 at 9:47 AM, Justin Erenkrantz <jus...@erenkrantz.com> > wrote: > > > Hi dev@, > > > > In response to some questions from Julien on Slack, I chatted with some > > Infra folks here at ApacheCon NA in Miami about the current state of > > affairs around Git support at ASF. There is a relatively new initiative > > called GitBox that is beginning some pilot tests with interested > projects. > > If you have not yet seen it, GitBox is up at: > > > > https://gitbox.apache.org/ > > > > It allows synchronization between Apache IDs and GitHub accounts. Once > > accounts are linked and an eligible project is in GitBox, then you will > > receive an invitation from the Apache GitHub organization to join that > > project on GitHub and be a "Collaborator" (e.g. you can push changes). > The > > canonical list of committers would be kept on the ASF LDAP > infrastructure - > > so as new committers are added to the project ACLs, they can then receive > > invites from GitBox if they have linked accounts. > > > > At that point, those with eligible and linked accounts can then > technically > > push to either gitbox.apache.org *or* github.com. However, Daniel (aka > > humbedooh) strongly suggested that the community pick one place to act > as a > > canonical location as Git can often get confused. That said, the backing > > infrastructure behind GitBox will do its best if we go to both places. > > > > This would allow integration with the GitHub PR workflow with the changes > > being mirrored over to gitbox.apache.org. This would replace the > existing > > git.apache.org workflow - it may be a bit disruptive to anyone using the > > existing git.apache.org repository or GitHub read-only mirror. > > > > If we're interested in going down this route, we'd need to file a JIRA > > ticket with Infra and get approval from either Daniel or Greg. They > would > > then schedule a time to do the transition. > > > > Thoughts? > > > > Cheers. -- justin > > > > > > -- > Julien >