The Welkin Suite Forum

Cannot resolve merge conflict



Cannot resolve merge conflict

  • Please log in to reply

#1
windows version welkinsuite

aedmonds

    Posted 05 Sep 2017

    Good morning,


    I am trying to resolve a very simple merge conflict. I changed a comment in each of two branches to force a merge conflict, then merged one branch into the other. The conflict occurred (as it should have). I have winmerge set as my merge tool. I merged the changes in winmerge until both files were identical, saved and quit winmerge.


    My version control panel then shows the attached. It says there are no conflicted changes to resolve. The conflicted file is shown as 'Resolved or without conflicts'. However, the 'Proceed' button is greyed out and my only option is to undo the merge.


    Any thoughts? I'd really like to recommend this as our IDE of choice later today (based on prior experience) but that relies on my getting the version control workflow ironed out.


    Thanks,


    Andy


    Attached Files


    3 replies to this topic

    #2

    kate.dulko

      Posted 05 Sep 2017

      Greetings,


      Thank you for bringing this issue to our attention.

      Our developers will work on this in one of the nearest versions of the IDE and we will solve the issue as soon as possible.


      Also, may I please ask you to tell me if the issue is reproduced for you each time or you can continue the process of merging conflicts after the restart of the IDE?


      I will keep you updated when we will release a fix for this issue.


      Thank you,
      Kate


      Kate Dulko
      Customer Relations

      The Welkin Suite

      twitter: @KateDulko
      skype id: d_katerina
      e-mail: kate.dulko@welkinsuite.com

       

        


      #3

      aedmonds

        Posted 06 Sep 2017

        Hi Kate,


        Thanks for the reply - the issue presents itself each time, even after a restart of the IDE.


        Regards,


        Andy



        #4

        kate.dulko

          Posted 06 Sep 2017

          Hi Andy,


          Thank you for your response.

          We will work on this issue soon and you will get the proper merge functionality in one of the nearest versions of The Welkin Suite IDE.


          Regards,

          Kate



          Kate Dulko
          Customer Relations

          The Welkin Suite

          twitter: @KateDulko
          skype id: d_katerina
          e-mail: kate.dulko@welkinsuite.com

           

            





          Boost Your Productivity. Get Started Today

          Try Free Trial