Graphite Git conflict issue

9 posts, 0 answers
  1. tbmihailov
    tbmihailov avatar
    3 posts
    Member since:
    Jun 2012

    Posted 30 Nov 2012 Link to this post

    Hi,
    I'm building application with Icenium Graphite.
    I'm using GitHub with private repository.
    At some stage of development there was an issue with Git:
    1. When I try to push some changes to the server i recieve conflict error and message "" telling me I have to pull and resolve issues. pic: 01-push-error.png
    2. When I try to pull I recieve another conflict issue and ask me to resolve local conflicts. See 02-pull-error-png
    3. However in Graphite "Conflicts" action that shoul show me the conflicts is desibled and no conflicts are found. I'm in kind of a push/pull deadlock.  See 03-no-conflict-option.png.

    /////---Here is the Graphite log:-----///
    [2012-11-30 17-27-13-41] Log (Info,None): Version 2012.3.1019.3. Deployment location https://app.icenium.com.
    [2012-11-30 17-27-46-32] Log (Info,None): Logged in as: tbmihailov@abv.bg
    MyProjectName Synchronized.
    [2012-11-30 17-55-17-58] Log (Exception,High): The remote repository has conflicts that cannot be resolved. You need to pull and resolve these conflicts locally first.

    [2012-11-30 17-57-11-10] Log (Warn,Medium): The local repository has conflicts that cannot be resolved. You need to resolve these conflicts manually and commit them.

    <MyProjectName> Synchronized.
  2. tbmihailov
    tbmihailov avatar
    3 posts
    Member since:
    Jun 2012

    Posted 30 Nov 2012 Link to this post

    I deleted the app project folder from <C:\Users\Todor\AppData\Local\Telerik\BlackDragon\tbmihailov_abv.bg\MyProjectName> and reinstalled Graphite, but when project was synced again same error appeared.
    I guess my git "local"  repo is on the server so for me it's ok to delete it, so I can clone my last stable version from GitHub.

    I'm at a mobile app camp so I need to resolve my issue ASAP.
    Thanks in advance.
  3. Deyan Varchev
    Admin
    Deyan Varchev avatar
    150 posts

    Posted 30 Nov 2012 Link to this post

    Hello,

     Thanks for contacting us. I hope this answer does not come too late for you. You are right to assume that the "local" git repository is actually hosted on the server. So if you are sure that your Github remote has the latest stable changes you can delete and clone from your remote repo. To be on the safe side, you can export your files prior to deleting the project so that you don't loose your data.

     I hope this will help you in the short term and we'll be investigating the conflicts resolution lock that you have gone into.

    All the best,
    Deyan Varchev
    the Telerik team

    Share feedback and vote for features on our Feedback Portal.
    Want some Kendo UI online training - head over to Pluralsight.
  4. tbmihailov
    tbmihailov avatar
    3 posts
    Member since:
    Jun 2012

    Posted 01 Dec 2012 Link to this post

    Hi, that is exactly what I did. I cloned the Git repo in new icenium project and merged manually.

    Regards,
    Todor
  5. Aaron
    Aaron avatar
    4 posts
    Member since:
    Aug 2013

    Posted 15 Aug 2013 Link to this post

    I would like to report that our project team is experiencing the same issue.
    If another team member as committed changes to the remote repository (TFS Cloud for us) then we are told we must do a pull and resolve conflicts.

    Unfortunately the 'conflicts' menu item is disabled after the pull. We have no way of knowing what we need to merge.
    This results in us being stuck in a push/pull deadlock where we have to back up our code, delete the project and start again.

    Has there been any progress on a bug fix for this issue?

    Cheers
    Aaron
  6. Steve
    Admin
    Steve avatar
    10941 posts

    Posted 16 Aug 2013 Link to this post

    Hi Aaron,

    Thanks for bringing this to our attention. Unfortunately we see that you've already deleted the project and started fresh i.e. we cannot determine what is the problem in the project by its current state. In order to get to the bottom of this, we would need you to report this problem immediately when it happens and leave the repository in the "corrupted" state, so we can investigate the cause for the problem.

    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.
  7. Jordan
    Jordan avatar
    16 posts
    Member since:
    Mar 2013

    Posted 16 Aug 2013 Link to this post

    Steve,

    My project is in the exact same state with my Github repository. I'm leaving the project in the corrupted state in hopes that you can fix the issue. Please let me know if you need any additional information from me. 

    Thanks,
    Jordan
  8. Jordan
    Jordan avatar
    16 posts
    Member since:
    Mar 2013

    Posted 19 Aug 2013 Link to this post

    Steve,

    I'm going to have to delete my project and start fresh because I need to get ready for an app update today. I tried attaching a FiddlerCap capture and a zip of my BlackDragon logs but the reply window said those extensions weren't valid types. If you need those files to help decipher things and have a different way I could submit them, let me know and I'll be happy to do that.

    My problem existed in Graphite and Mist. When I tried pushing changes to github, it told me I had conflicts and needed to pull and resolve conflicts first. When I pulled, it said there were conflicts and I needed to manually merge the conflicts but I could never find a file that needed to be resolved in Graphite.

    Jordan
  9. Ivan
    Admin
    Ivan avatar
    111 posts

    Posted 20 Aug 2013 Link to this post

    Hello,

    Your problem seems very similar to the following one: 'Mist, Graphite report conflicts on pull, do not report details'. The short answer is we do not (yet) know how you have managed to put your local repository in a such state, since we cannot reproduce the problem on our end, but we have logged the issue and we are planning to provide you some means to recover from this state more gracefully, without the need to: backup, delete, clone and re-import your project every time.

    Any information that can shed some light on how to reproduce the problem will be greatly appreciated.

    @Jordan: The forums does not allow you to attach other files but images. To send us the FiddlerCap capture, could you, please send the zip to support at icenium.com. Once we have a resolution we will post it here.

    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