Date: Mon, 4 May 2015 10:49:45 -0400 From: Craig Rodrigues <rodrigc@FreeBSD.org> To: Cy Schubert <Cy.Schubert@komquats.com> Cc: "jenkins-admin@freebsd.org" <jenkins-admin@freebsd.org>, "freebsd-current@freebsd.org" <freebsd-current@freebsd.org>, "neel@freebsd.org" <neel@freebsd.org>, "cy@freebsd.org" <cy@freebsd.org> Subject: Build failed in Jenkins: FreeBSD_HEAD #2725 Message-ID: <CAG=rPVf8a1h%2BBeKbmd_JDQLve78iyqwAua3kL1SCD=i0eOnuSA@mail.gmail.com> In-Reply-To: <201505041326.t44DQH1E046967@slippy.cwsent.com> References: <861766483.4.1430730824975.JavaMail.jenkins@jenkins-9.freebsd.org> <201505041326.t44DQH1E046967@slippy.cwsent.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Monday, May 4, 2015, Cy Schubert <Cy.Schubert@komquats.com <javascript:_e(%7B%7D,'cvml','Cy.Schubert@komquats.com');>> wrote: > > > I cannot see where the problem is. All local tests, including universe, > have built cleanly. > In this log: https://jenkins.freebsd.org/job/FreeBSD_HEAD/2725/console search for: error: version control conflict marker in file -- Craig
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAG=rPVf8a1h%2BBeKbmd_JDQLve78iyqwAua3kL1SCD=i0eOnuSA>