i tested and had a
Pull Failed. Source{name='tomee-8.0', scmUrl='
https://github.com/apache/tomee.git', branch='tomee-8.x'}
> git pull
org.eclipse.jgit.api.errors.CheckoutConflictException: Checkout conflict
with files:
docs/comparison.adoc
i'll update to do a reset hard on remote instead of pull
and commit that as a pull request, if it can help
On Thu, 20 Oct 2022 at 17:06, Zowalla, Richard <
richard.zowa...@hs-heilbronn.de> wrote:
> Might be related to "master" -> "main" switch a while back.
> I added a commit, I had already made in my local repository after
> preparing release notes.
>
> Don't know, if this solves the issue but could be a thing to look at.
>
> Am Donnerstag, dem 20.10.2022 um 16:53 +0200 schrieb Swell:
> > looked and noticed adoc from only tomee 8.x branch, generated html
> >
> > looking further.
> >
> > --
> > Swell
> >
> > On Thu, 20 Oct 2022 at 16:30, David Blevins <david.blev...@gmail.com>
> > wrote:
> >
> > > I looked into this about two weeks back for a couple hours but
> > > didn't
> > > really find the cause.
> > >
> > > Basically our Jenkins job that builds and publishes the site is
> > > running,
> > > but only javadoc is getting produced and not any adoc -> html:
> > >
> > > - https://ci-builds.apache.org/job/Tomee/job/site-publish/
> > >
> > > I ran the `tomee-site-generator` locally a handful of times and it
> > > also
> > > fails on my machine, but I ran out of time to debug.
> > >
> > > Posting here so others can investigate if they want -- I'm going to
> > > try
> > > and focus on the failing JAX-RS tests.
> > >
> > >
> > > -David
> > >
> > >
>
>
