From: | catalyst@×××××××××××××××××××××××.org |
---|---|
To: | releng@g.o, gentoo-releng-autobuilds@l.g.o |
Subject: | [gentoo-releng-autobuilds] [ia64-auto] Catalyst build error - pre_build |
Date: | Tue, 13 Mar 2012 03:13:37 |
Message-Id: | 20120313031335.B4211E0A9C@pigeon.gentoo.org |
1 | Your pre_build function sucks |
2 | |
3 | |
4 | From git://git.overlays.gentoo.org/proj/releng |
5 | 8c70eae..81f0612 master -> origin/master |
6 | error: Your local changes to the following files would be overwritten by merge: |
7 | tools/catalyst-auto-ia64.conf |
8 | Please, commit your changes or stash them before you can merge. |
9 | Updating 8c70eae..81f0612 |
10 | Aborting |
11 | |
12 | |
13 | |
14 | Full build log at /tmp/catalyst-auto.13420/log/pre_build.log |