Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

This does not compile #2

Open
mboratko opened this issue Sep 4, 2015 · 1 comment
Open

This does not compile #2

mboratko opened this issue Sep 4, 2015 · 1 comment

Comments

@mboratko
Copy link

mboratko commented Sep 4, 2015

After cloning and doing a ./configure, the Makefile ends up with tons of git merge lines in it such as
<<<<<< HEAD

It seems as though you have not cleared the various merge conflict which arose from 2110239
@kfogel
Copy link
Member

kfogel commented Sep 19, 2015

Thanks for pointing this out, @process91. There are indeed a ton of conflict markers resulting from that merge, and not all of them are trivially resolveable.

Does anyone know (waves at @risacher) how a merge that is supposedly just an "Update to latest version of CACKey" could have conflicts? It seems our copy and whatever @rkeene was drawing from must have diverged somewhere...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@kfogel @mboratko