Mist, Graphite report conflicts on pull, do not report details

5 posts, 0 answers
  1. Candace
    Candace avatar
    9 posts
    Member since:
    Sep 2011

    Posted 15 Aug 2013 Link to this post

    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!
  2. Aaron
    Aaron avatar
    4 posts
    Member since:
    Aug 2013

    Posted 16 Aug 2013 Link to this post

    This is also a serious issue for our development team. We are experiencing the same issues.

    Each developer is needing to back up their changes, abandon and re-close the project from source control, then manually redo their changes from the back up.

    It seems that a single developer can do repeated pushes/pull until another developer has pushed changes (even if the changes are in different files), then they have to go through this process.
  3. Steve
    Admin
    Steve avatar
    10941 posts

    Posted 16 Aug 2013 Link to this post

    Hi guys,

    Such problem can occur if you have untracked files in the repository. We're not yet sure what are the exact steps that replicate this problem, but is clearly caused by some sequence of commits from multiple users and possibly Revert/Reset operation on the repository. Regardless of the case in which this problem occurs, we need to have a way for users to fallback and fix the repository state back to working state and we have logged this task to our features list.

    Please excuse us for the temporary inconvenience.

    Regards,
    Steve
    Telerik

    Do you enjoy Icenium? Vote for it as your favorite new product here (use short code H048S).
    Looking for tips & tricks directly from the Icenium team? Check out our blog!
    Share feedback and vote for features on our Feedback Portal.
  4. Bill
    Bill avatar
    9 posts
    Member since:
    Jul 2013

    Posted 16 Aug 2013 Link to this post

    I had this same issue working on a project from multiple machines with one developer. What do you mean by an "untracked file in the repository"?

    Thanks.
  5. Ivan
    Admin
    Ivan avatar
    111 posts

    Posted 20 Aug 2013 Link to this post

    Hello,

    Normally when you add or delete a file in Graphite or Mist it is automatically added or deleted in the Git repository as well. However due to some error condition you might get the file system and Git out of sync (e.g. you might have a file that exists in the file system, but is not added in the Git repository, i.e. you have an 'untracked' file in terms of Git). In this case if you pull from a remote repository where the same file exists, Git would complain that there is a conflict, however the file would not appear as conflicting, because it is not tracked in your local Git repository.

    Please, note that such condition should not happen under normal circumstances, and we have failed to reproduce the problem on our end so far. Nevertheless, we have already logged a story about allowing the users to recover from this situation more gracefully, rather than deleting and cloning the project again.

    Once again, please excuse us for the temporary inconvenience.

    Regards,
    Ivan
    Telerik

    Do you enjoy Icenium? Vote for it as your favorite new product here (use short code H048S).
    Looking for tips & tricks directly from the Icenium team? Check out our blog!
    Share feedback and vote for features on our Feedback Portal.
Back to Top