Sometimes I get the following error message when I try to commit a file:
Sync Failed. There are both local and remote commits. Please commit all
your changes and then sync again.
I only get this message occasionally. I can discern no pattern. In fact,
if I click Cancel, then make another change to the same file and re-commit,
I do NOT get this error message. Even more vexing, as near as I can tell,
my changes are committed even when I click Cancel, as my co-workers are
able to access them.
I don't know whether this is related, but a couple days ago, when I tried
to commit a file, Git displayed instead a list of about 10 file conflicts
-- on files that not only had I not touched, but that I had not even
opened. They were all files one of my colleagues had just worked on.
This is both vexing and worrisome. I'm afraid I'm going to lose work. I
can't find anything about this in the documentation, and as near as I can
determine my repositories are set up correctly.
I'm using Git with the online Help authoring tool Flare, running on
Windows, which in turn is running on a Mac via Parallels.
Really appreciate any ideas any of you may have.
Thanks very much.
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email
For more options, visit https://groups.google.com/d/optout.