on merges check every open change for merge conflicts
Bug #1172401 reported by
James E. Blair
This bug affects 1 person
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| OpenStack Core Infrastructure |
Fix Released
|
Medium
|
Unassigned | ||
| Zuul |
Fix Released
|
Undecided
|
Unassigned | ||
Bug Description
When a change merges to a project, check each open change in that
project for a merge conflict. If it can't merge, leave a message in
gerrit.
affects openstack-ci
milestone havana
status triaged
importance medium
affects zuul
Revision history for this message
| Clark Boylan (cboylan) wrote | #1 |
Revision history for this message
| Jeremy Stanley (fungi) wrote | #2 |
| Changed in zuul: | |
| status: | New → Fix Released |
| Changed in openstack-ci: | |
| status: | Triaged → Fix Released |
| milestone: | havana → icehouse |
To post a comment you must log in.
Noting that Gerrit 2.9 may include a thing that checks for merge conflicts out of the box. There is work that has gone into this, upstream dogfooded it, found they didn't like it a whole lot and are now working on fixing it so this depends on whether or not they manage to fix it in an acceptable way.