EPUM instance update conflicts #20

Open
wants to merge 3 commits into
from

Projects

None yet

3 participants

@labisso
Member
labisso commented Jul 3, 2013

Fixes OOIION-1108: poor handling of conflicts during instance updates.

@lukecampbell

How did you get that fancy "determining merge status" in there?

@labisso
Member
labisso commented Jul 3, 2013

We run our own Jenkins build server in addition to buildbot. It automatically builds pull requests and implements Github's Commit Status API. Last I checked Buildbot doesn't yet support this.

@oldpatricka
Contributor

@lukecampbell looks like there is actually a similar plugin for buildbot: https://github.com/Kami/node-buildbot-github

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment