Yes github says it merges cleanly (still does in fact):

This branch has no conflicts with the base branch when rebasingRebase and
merge can be performed automatically.

The previous revision DID have a merge conflict which is exactly why I
rebased on develop, resolved conflicts and then pushed to my fork.
Rerunning the tests against my latest push is what seems to be failing.

So I'll change my question since some folks seem convinced that I'm causing
the problem:

Why does concourse not run tests for my PR after I push changes that
resolve a conflict?

Thanks,
Kirk

On Mon, Nov 12, 2018 at 5:26 PM, Robert Houghton <rhough...@pivotal.io>
wrote:

> Does github say it merges cleanly? I thought their messaging was pretty
> clear
>
> On Nov 12, 2018 17:19, "Alexander Murmann" <amurm...@pivotal.io> wrote:
>
> I wonder if we somehow could find a way to make the error message clearer.
> Since it didn't merge cleanly, there is action I need to take as the
> committer. However, I would never know that from the error message.
>
> On Mon, Nov 12, 2018 at 4:34 PM Patrick Rhomberg <prhomb...@pivotal.io>
> wrote:
>
>
> > See also the previous time this occurred.
> >
> > https://markmail.org/thread/apwupkbkg3qipygo
> >
> > On Mon, Nov 12, 2018 at 4:18 PM, Owen Nichols <onich...@pivotal.io>
> wrote:
> >
> > > This error usually means it didn’t merge cleanly, not that concourse is
> > > “down"
> > >
> > > > On Nov 12, 2018, at 3:58 PM, Kirk Lund <kl...@apache.org> wrote:
> > > >
> > > > I'm trying to get my PR to run tests, but the latest concourse jobs
> are
> > > > failing with:
> > > >
> > > > rsync_code_down-OpenJDK8
> > > > missing inputs: geode, instance-data
> > > > archive-results-OpenJDK8
> > > > missing inputs: concourse-metadata-resource, geode, geode-results
> > > > delete_instance-OpenJDK8
> > > > missing inputs: geode, instance-data
> > > >
> > > > Anyone know what that means?
> > > >
> > > > Thanks,
> > > > Kirk
> > >
> > >
> >
>

Reply via email to