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

Already on GitHub? Sign in to your account

Bundler should abort if the lockfile contains "<<<<<<< HEAD" #1821

indirect opened this Issue Apr 5, 2012 · 1 comment


None yet
2 participants

indirect commented Apr 5, 2012

Conflicted merges can produce lockfiles containing merge-resolution information. The lockfile parser will happily read those lines and try to produce crazy and impossible definitions from them. Seems bad.


rohit commented Nov 30, 2012

There is a PR open for this issue: carlhuda#2007

@rohit rohit closed this Feb 20, 2013

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment