I use coho to manage PRs. Not sure if it handles this use case. ./coho list-pulls -r repoName
If commits exist, coho outputs something like ----------------------------------------------------------------------------------------------- stevengill: Update tools-release-process.md (stevengill 3 days ago) ----------------------------------------------------------------------------------------------- * https://github.com/apache/cordova-coho/pull/25 To merge: git pull https://github.com/stevengill/cordova-coho.git patch-8 I then either review on github or paste & run that merge command in the repo and review it locally. I push to master if everything looks good. Not sure if this is the best way to do it. Any suggestions on a optimal workflow for this would be appreciated. On Wed, May 28, 2014 at 5:17 PM, Shazron <shaz...@gmail.com> wrote: > I think its fine as long as it's traceable who did the actual commit > > > On Wed, May 28, 2014 at 5:15 PM, Michal Mocny <mmo...@chromium.org> wrote: > > > ..both the git am --signoff and the git merge --no-ff option ends up with > > committer: and author: metadata that are not cordova committers. I think > > that should be fine so long as its clear which committer did the signoff > / > > merge -- but wanted to confirm? > > > > > > On Wed, May 28, 2014 at 8:11 PM, Shazron <shaz...@gmail.com> wrote: > > > > > Yeah mystery solved: > > > http://apache.markmail.org/thread/zxrdc25iaq4g7bu7 > > > > > > I usually add a ".patch" to the Github PR url and download then apply > the > > > patch (after review of course) then do a signoff when applying the > patch > > > (git am --signoff ...) > > > > > > > > > On Wed, May 28, 2014 at 4:55 PM, Joe Bowser <bows...@gmail.com> wrote: > > > > > > > I'm pretty sure this is more of a git issue than anything else: > > > > > > > > I found an unknown committer in Cordova-Android: > > > > > > > > > > > > > > https://git-wip-us.apache.org/repos/asf?p=cordova-android.git;a=commit;h=11fc6be32871c3e6ce5159d34c99665cd7d05de5 > > > > > > > > It would be good to know how this commit wound up in here, since I > > > > would rather blame a bad git merge. I'm not going to roll anything > > > > back because of this trivial commit. > > > > > > > > On Wed, May 28, 2014 at 4:20 PM, Shazron <shaz...@gmail.com> wrote: > > > > > > > > > > > > > > > https://git-wip-us.apache.org/repos/asf?p=cordova-blackberry.git;a=commit;h=b128ad7c6dcf0061c8616ba3e145c07faeaa8e02 > > > > > > > > > > Rowell Cruz, from BlackBerry. He has a listed CLA but is definitely > > not > > > > an > > > > > Apache Cordova committer. Can someone at Blackberry shed some light > > on > > > > this? > > > > > > > > > > I was triaging issues and came to this issue: > > > > > https://issues.apache.org/jira/browse/CB-6730 > > > > > and wanted to see who pulled this in, but both author and committer > > are > > > > the > > > > > same. The committer field should be only a Cordova PMC voted > > committer. > > > > > > > > > >
