Dang, something went wrong. I followed up with some additional commits to correctly update caffe.proto, fix lint errors, and document the layer in vision_layers.hpp, and pushed to bvlc/dev [70825f95ad51dc3d8696c070efca3241f698a8b4], but for some reason github didn't pick it up automatically here.

Thanks Sergio!

@sergeyk there's a convention you need to follow to make github understand manual merges. I'm all for doing the merge yourself for the sake of integration, but you need to make the merge commit with a github style commit message.

Better yet, collaborate with the requester by checking out a tracking branch of the pull request branch then pushing your changes to the existing request. Of course that only works if you have push rights, or you could ask the collaborator to merge your commits.

I rebased dev to fix your merge.

There's no way to fix this PR to show it as merged rather than closed however. If you want to do a manual merge in the future, please format the merge commit like I did in efbea35 (rebasing your commit) to trigger the github merge machinery.

Alright, thanks

On Tuesday, May 20, 2014, Evan Shelhamer notifications@github.com wrote:

There's no way to fix this PR to show it as merged rather than closed
however. If you want to do a manual merge in the future, please format the
merge commit like I did in efbea35efbea35092201a2868303cb5126f6f90d992de51(rebasing your commit).

—
Reply to this email directly or view it on GitHubhttps://github.com//pull/421#issuecomment-43713159
.

4d52ca7 broke Caffe. There's no seed_ member of ArgMaxLayerTest(). Run the tests!

Fixed by revert @ a13e7ee.

Thanks, sorry about that.

On Tuesday, May 20, 2014, Evan Shelhamer notifications@github.com wrote:

Fixed by revert @ a13e7ee a13e7ee.

—
Reply to this email directly or view it on GitHubhttps://github.com//pull/421#issuecomment-43713884
.

I'm confused about what happened with my PR? @sergeyk or @shelhamer did you merge it? @sergeyk did you try to push to my repo?

@sguada your PR is merged and everything's alright.

Sergey did a weird merge github couldn't understand, I fixed it to reflect history but github can't be told what actually happened at this point, so the PR is closed but it is in fact merged if you look at BVLC/dev.

@shelhamer thanks !!

It was a bit confusing for me, but I checked in dev and seems merged appropriately.
@sergeyk could you review #422 too?