merge conflicts?
[email protected] (Don Cohen)
| Newsgroups | gmane.lisp.clisp.devel |
|---|---|
| Message-ID | <[email protected]> |
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 So the problem seems if anything to be getting worse. I mention it to clisp-devel in case it's something that someone reading this has to do something about and doesn't realize it. Let me know if I should have reported this earlier or waited longer (how much?) to report it. ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ clisp-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/clisp-devel