"1 conflict prevents checkout" -- but which one?

[abliss]

$ git meta checkout upstream/master
Unable to check out meta-repo: 1 conflict prevents checkout.
$ git meta version
version 0.4.0
internal build 12

[bpeabody]

Do you actually have changes in the meta-repo?

On Jun 13, 2017, at 11:10 AM, Adam Bliss [email protected] wrote:

$ git meta checkout upstream/master Unable to check out meta-repo: 1 conflict prevents checkout. $ git meta version version 0.4.0 internal build 12 — You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub, or mute the thread.

[abliss]

Not according to "git status".

[jhedwardyang]

I just had this happen with no submodules open.

[bpeabody]

I can address the lack of conflict information in this ticket, but if one of you can repro getting that error when you have no changes, please open another issue.

[abliss]

I just saw a variant:

abliss@home:~/src/metaqa2$ git meta checkout 6f42cf51174561e037dc09e64000597e36dc4ace
Unable to checkout submodule ts/foo/bar: 1 conflict prevents checkout.

When I instead do a git checkout and a git submodule update, it tells me exactly which file (ts/foo/bar/blah.txt) has the conflict.