I think that may be the result of the way we do PR.. I merged the PR Joe points to, and I did it by pulling from his fork, and merging it into cordova-android. In theory, this way any edits I need to do end up in my merge commit, and the contributor changes are isolated in the original work without my touching it.
The problem is that in this case a fast-forward was enough, and no merge commit was needed. There is a way to merge forcing a merge commit even when a fast-forward is possible (--no-ff), and I've started using this more recently. Probably we should update the docs to add this. On Wed, May 28, 2014 at 7: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. >
