Re: merge conflicts?

[Bruno H. <br...@cl...>]

Hi Don,

> Yesterday's nightly build transcript showed:
>  Sat Oct 14 03:40:06 PDT 2017
>  pulling from http://hg.code.sf.net/p/clisp/clisp
>  searching for changes
>  adding changesets
>  adding manifests
>  adding file changes
>  added 1 changesets with 2 changes to 2 files
>  abort: outstanding merge conflicts
> 
> I imagined this was a temporary problem and decided to wait
> and see whether it resolved itself on the next try.
> 
> Today's shows:
>  Sun Oct 15 04:09:04 PDT 2017
>  pulling from http://hg.code.sf.net/p/clisp/clisp
>  searching for changes
>  adding changesets
>  adding manifests
>  adding file changes
>  added 5 changesets with 11 changes to 3 files
>  abort: outstanding merge conflicts

Did you try a Google search for
  "outstanding merge conflicts" site:stackoverflow.com

Bruno