Report conflicting files on merge error
Bug #1087764 reported by
Antoine "hashar" Musso
This bug affects 2 people
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| Zuul |
Triaged
|
Wishlist
|
Unassigned | ||
Bug Description
Whenever a patch is no more in sync with latest master, Zuul might ends up having a conflict when attempting to merge the change. It reports the following error message:
This change was unable to be automatically merged with the current state of the repository. Please rebase your change and upload a new patchset.
It would be great to catch the git output from merger.merge and report it in the message as well. That will give some clue to the user as to how severe the conflict is. Some minor conflicts can be handled right away while other need more work and the user will want to postpone the rebase at a later time.
| Changed in zuul: | |
| status: | New → Incomplete |
| status: | Incomplete → New |
Revision history for this message
| James E. Blair (corvus) wrote | #1 |
| Changed in zuul: | |
| status: | New → Triaged |
| importance: | Undecided → Wishlist |
To post a comment you must log in.
Good idea!