PR integration race condition?

[davidlange6]

The CMSSW_7_5_X_2015-04-23-2300 build appears to have picked up only part of #8833, causing some run time problems. I guess there is a race condition either on our side or on the git hub side that brought in only part of a commit. The repo is consistent now, so it was a transient effect.

Anything that we can do about this beyond not accepting PRs at 10:59:59.99999?

@ktf, @smuzaffar, @nclopezo @Degano

[davidlt]

Git itself cannot have inconsistent state. Maybe its -x ours? That is merge conflict, and -x ours made a mess out of it.

[nclopezo]

It seems that it was caused by the porting of #8805 which contains 7be30ee

[davidlange6]

On Apr 24, 2015, at 1:55 PM, davidlt notifications@github.com wrote:

Git itself cannot have inconsistent state. Maybe its -x ours? That is merge conflict, and -x ours made a mess out of it.

to be clear - the state of the repo is now fully consistent. - just not at the moment that the IB was triggered.

—
Reply to this email directly or view it on GitHub.