<html><head><meta http-equiv="Content-Type" content="text/html charset=us-ascii"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;"><br><div><div>On 18 Jul 2014, at 14:32, Kim Bruce <<a href="mailto:kim@cs.pomona.edu">kim@cs.pomona.edu</a>> wrote:</div><br class="Apple-interchange-newline"><blockquote type="cite"><meta http-equiv="Content-Type" content="text/html charset=us-ascii"><div style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;">Andrew,<div><br></div><div>When trying to use the built-in precompiled collections library, my program goes off into a black hole, never compiling. To make sure I had the most recent version of collections to look at, I tried doing a git pull on your repository. That failed as well, with the following error message:<div><br></div><div><div style="margin: 0px; font-size: 11px; font-family: Menlo;">kbb04747-mac11:minigrace kim$ git pull</div><div style="margin: 0px; font-size: 11px; font-family: Menlo;">remote: Counting objects: 87, done.</div><div style="margin: 0px; font-size: 11px; font-family: Menlo;">remote: Compressing objects: 100% (82/82), done.</div><div style="margin: 0px; font-size: 11px; font-family: Menlo;">remote: Total 87 (delta 51), reused 11 (delta 5)</div><div style="margin: 0px; font-size: 11px; font-family: Menlo;">Unpacking objects: 100% (87/87), done.</div><div style="margin: 0px; font-size: 11px; font-family: Menlo;">From <a href="https://github.com/apblack/minigrace">https://github.com/apblack/minigrace</a></div><div style="margin: 0px; font-size: 11px; font-family: Menlo;"> + 742ecbe...a8a38f0 master -> origin/master (forced update)</div><div style="margin: 0px; font-size: 11px; font-family: Menlo;"> * [new branch] ranges -> origin/ranges</div><div style="margin: 0px; font-size: 11px; font-family: Menlo;">Auto-merging js/gracelib.js</div><div style="margin: 0px; font-size: 11px; font-family: Menlo;">CONFLICT (content): Merge conflict in js/gracelib.js</div><div style="margin: 0px; font-size: 11px; font-family: Menlo;">Auto-merging gracelib.c</div><div style="margin: 0px; font-size: 11px; font-family: Menlo;">CONFLICT (content): Merge conflict in gracelib.c</div><div style="margin: 0px; font-size: 11px; font-family: Menlo;">Auto-merging gUnit.grace</div><div style="margin: 0px; font-size: 11px; font-family: Menlo;">CONFLICT (add/add): Merge conflict in gUnit.grace</div><div style="margin: 0px; font-size: 11px; font-family: Menlo;">Auto-merging collections.grace</div><div style="margin: 0px; font-size: 11px; font-family: Menlo;">CONFLICT (add/add): Merge conflict in collections.grace</div><div style="margin: 0px; font-size: 11px; font-family: Menlo;">Auto-merging StandardPrelude.grace</div><div style="margin: 0px; font-size: 11px; font-family: Menlo;">Automatic merge failed; fix conflicts and then commit the result.</div><div style="margin: 0px; font-size: 11px; font-family: Menlo;">kbb04747-mac11:minigrace kim$ </div><div style="margin: 0px; font-size: 11px; font-family: Menlo;"><br></div><div style="margin: 0px; font-size: 11px; font-family: Menlo;">Any idea on what I should do?</div><div style="margin: 0px; font-size: 11px; font-family: Menlo;"><br></div><div>
<span class="Apple-style-span" style="border-collapse: separate; border-spacing: 0px;"><div>Kim</div><div><br></div></span></div></div></div></div></blockquote><div><br></div></div>I think that this is because I did the rebasing that Tim requested. Rebasing changes the history, which is why all the git documents say never to do it on a public repository. <div><br></div><div>I think that the best thing to do is to throw out your repository and do a fresh clone of my repo.</div><div><br></div><div><span class="Apple-tab-span" style="white-space:pre"> </span>Andrew</div><div> </div></body></html>