| 1 |
Your pre_build function sucks |
| 2 |
|
| 3 |
|
| 4 |
error: Your local changes to the following files would be overwritten by merge: |
| 5 |
releases/weekly/specs/amd64/hardened/admincd-stage1.spec |
| 6 |
releases/weekly/specs/amd64/installcd-stage1.spec |
| 7 |
releases/weekly/specs/amd64/livecd-stage1.spec |
| 8 |
releases/weekly/specs/amd64/livedvd-stage1.spec |
| 9 |
releases/weekly/specs/x86/hardened/admincd-stage1.spec |
| 10 |
releases/weekly/specs/x86/hardened/installcd-stage1.spec |
| 11 |
releases/weekly/specs/x86/i686/livecd-stage1.spec |
| 12 |
releases/weekly/specs/x86/i686/livedvd-stage1.spec |
| 13 |
releases/weekly/specs/x86/installcd-stage1.spec |
| 14 |
Please, commit your changes or stash them before you can merge. |
| 15 |
Aborting |
| 16 |
Updating 2a2dc54..e6637d1 |
| 17 |
|
| 18 |
|
| 19 |
|
| 20 |
Full build log at /tmp/catalyst-auto.19870/log/pre_build.log |
Archives