This question is locked. New answers and comments are not allowed.
We're experiencing this issue in both Mist and Graphite - When pulling from the repository and conflicts exist, we get a dialog box alerting us that conflicts exist. We then attempt to view the conflicts under "Version Control" > "Conflicts" - and no conflicts are reported. We cannot push or pull at this point, as over and over we get the "conflicts" exist, with no avenue to resolve them, and we are stuck. We have to manually export the project, run a diff, and then abandon the project and create a new one. Can this be addressed or can we get advise on how to work around this issue? Thanks!