[Grace-core] minigrace (Portland) problems

[Andrew P. Black]

On 18 Jul 2014, at 14:32, Kim Bruce <kim at cs.pomona.edu> wrote:

> Andrew,
> 
> 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:
> 
> kbb04747-mac11:minigrace kim$ git pull
> remote: Counting objects: 87, done.
> remote: Compressing objects: 100% (82/82), done.
> remote: Total 87 (delta 51), reused 11 (delta 5)
> Unpacking objects: 100% (87/87), done.
> From https://github.com/apblack/minigrace
>  + 742ecbe...a8a38f0 master     -> origin/master  (forced update)
>  * [new branch]      ranges     -> origin/ranges
> Auto-merging js/gracelib.js
> CONFLICT (content): Merge conflict in js/gracelib.js
> Auto-merging gracelib.c
> CONFLICT (content): Merge conflict in gracelib.c
> Auto-merging gUnit.grace
> CONFLICT (add/add): Merge conflict in gUnit.grace
> Auto-merging collections.grace
> CONFLICT (add/add): Merge conflict in collections.grace
> Auto-merging StandardPrelude.grace
> Automatic merge failed; fix conflicts and then commit the result.
> kbb04747-mac11:minigrace kim$ 
> 
> Any idea on what I should do?
> 
> Kim
> 

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.   

I think that the best thing to do is to throw out your repository and do a fresh clone of my repo.

	Andrew
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailhost.cecs.pdx.edu/pipermail/grace-core/attachments/20140720/723b590a/attachment.html>