Version control not allowing push or commit

8 posts, 0 answers
  1. Bill
    Bill avatar
    9 posts
    Member since:
    Jul 2013

    Posted 13 Aug 2013 Link to this post

    I'm trying to push changes to my remote github account and Icenium says it can't unless I have a clean local repo. The commit menu item is disabled but I can get to the commit dialog by trying a push and answering "yes" to the question asked. 

    In Mist, the conflict tab in the commit dialog has nothing in it.
    In Graphite, the conflict tab shows a file (C1Gallery.html) but will not allow me to do anything, using the merge tool shows a blank file for the local file. I cannot revert this file or resolve to any of the selections. When I try a commit from Mist I get the following error in the console.

    2013/8/13 13:37:58 Server error: : https://app.icenium.com/api/versioncontrol/VF : Internal Server Error

    I had modified some files on my local git repository and pushed those to github. This seems to have confused Icenium and now I can't do anything.

    I need to be able to modify the files outside of Icenium, the tools in Visual Studio and Beyond Compare are more powerful and more familar to me.

    Thanks

    - Bill
  2. Steve
    Admin
    Steve avatar
    10941 posts

    Posted 15 Aug 2013 Link to this post

    Hi Bill,

    We have not been contacted with such a problem before, are there any errors in Graphite log? If there are errors, please attach them to this post, so we can review them.
    When I pulled your project locally, the Commit menu is enabled and has 12 modified items and 9 renamed. In History I see three commits from 13th.  If I change the repo in "Configure Remote Repository" menu I am able to commit and push changes without any problems.

    If something has gone wrong, it is definitely on your local machine, you can try saving your changes in external editor, pull your project from the github repo again and reapply them.

    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.
  3. Bill
    Bill avatar
    9 posts
    Member since:
    Jul 2013

    Posted 16 Aug 2013 Link to this post

    First, where is the Graphite log located?  I'll check that.

    I work on this project on three different machines, home, laptop and work. I almost always push to a remote github repo before I pack up an any one machine. This problem happened on both my laptop and my work machine to i don't think its related to a particular machine. I "fixed" the problem by creating a new project and pulling from the remote repo.

    Thanks

    - Bill
  4. Steve
    Admin
    Steve avatar
    10941 posts

    Posted 16 Aug 2013 Link to this post

    Hello Bill,

    The logs are available in %LOCALAPPDATA%\Telerik\BlackDragon\Logs folder. If you are able to reproduce the steps to cause the issue please also save the Graphite session from FiddlerCap (with the Decrypt HTTPS Traffic option enabled). Start it before launching Graphite and save the HTTP requests Graphite performs to disk. You can upload both to a free file server or attach them in your bug report.

    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.
  5. Jeremy
    Jeremy avatar
    8 posts
    Member since:
    Nov 2012

    Posted 03 Oct 2013 Link to this post

    I just had the same problem in Icenium Mist -- the problem is a conflict with the `.gitignore` file, which is hidden by default from the IDE.  I later tried adding one explicitly, hoping that by making it a visible part of the project that it would then show up in the conflict resolution window, but no dice.

    I get the following message in the log console (urls changed for brevity):
    2013/10/3 9:56:13 Commit: Merge branch 'master' of https://github.com/...blah....git

    Conflicts:
        .gitignore

    projectname\somefiles
    ...more files...

    2013/10/3 9:56:14 Server error:  : https://app.icenium.com/api/versioncontrol/projectname: Internal Server Error
  6. Steve
    Admin
    Steve avatar
    10941 posts

    Posted 03 Oct 2013 Link to this post

    Hello,

    Most likely this is due to line endings differences. Should you resolve the conflict with your local version, you should be fine.

    Regards,
    Steve
    Telerik
    You've missed the Icenium Visual Studio Integration keynote? It has been recorded and posted here.
    Looking for tips & tricks directly from the Icenium team? Check out our blog!
    Share feedback and vote for features on our Feedback Portal.
  7. Jeremy
    Jeremy avatar
    8 posts
    Member since:
    Nov 2012

    Posted 16 Oct 2013 Link to this post

    At least in my case, the problem that there's no way to resolve the conflict.  It doesn't actually indicate what the conflict is -- and again, in my case, the conflict is between Mist and Github (I can push/pull back and forth between my computer and Github).
  8. Steve
    Admin
    Steve avatar
    10941 posts

    Posted 18 Oct 2013 Link to this post

    Hello Jeremy,

    Basically what you should see in order to resolve the problem is this. If this does not show in Mist for some reason, you can try Graphite on a Windows machine. I would log a bug for investigating the missing conflict in Mist.

    Regards,
    Steve
    Telerik
    You've missed the Icenium Visual Studio Integration keynote? It has been recorded and posted here.
    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