Add mix.lock merge conflict error warning?

Matthew Lehner

unread,

Apr 4, 2016, 10:02:00 PM4/4/16

to elixir-lang-core

While I was doing some Elixir stuff tonight I ran into a merge conflict with `mix.lock` – when you run `mix deps.get` it returns a SyntaxError which totally makes sense, but, I was thinking it might be nice to return an intelligent error, similar to what Bundler does when Gemfile.lock has merge conflicts.

Bundler raises a LockfileError with the text:

"Your #{Bundler.default_lockfile.relative_path_from(SharedHelpers.pwd)} contains merge conflicts.\n" \

"Run `git checkout HEAD -- #{Bundler.default_lockfile.relative_path_from(SharedHelpers.pwd)}` first to get a clean lock."

See the ruby here.

Would there be any interest in adding something similar to `deps.get`?

Daniel Perez

unread,

Apr 4, 2016, 11:51:05 PM4/4/16

to elixir-lang-core

Conflicts in mix.lock are indeed quite common, so I agree a nice error message would be nice to have and simple enough to implement.

José Valim

unread,

Apr 5, 2016, 2:30:43 AM4/5/16

to elixir-l...@googlegroups.com

Yes, please open up an issue, let's add this. :)

José Valim

www.plataformatec.com.br

Skype: jv.ptec

Founder and Director of R&D

--
You received this message because you are subscribed to the Google Groups "elixir-lang-core" group.
To unsubscribe from this group and stop receiving emails from it, send an email to elixir-lang-co...@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/elixir-lang-core/f30cc496-0b69-479f-836f-290e6eef7ee7%40googlegroups.com.

For more options, visit https://groups.google.com/d/optout.

Reply all

Reply to author

Forward