How to handle merge conflicts in the pages file

3 posts, 0 answers
  1. Kim
    Kim avatar
    2 posts
    Member since:
    Nov 2015

    Posted 30 Jan 2017 Link to this post

     

    We work on two machines to create the Telerik-tests. We always do a tfs-getlatest to make sure we have the latest version of the tests. If someone did a checkin, we get a merge conflict on the pages file. We would like to merge the changes, but the file completely changed, so you can't see if the 'auto-merge' is correct. This also happens if someone just opens Telerik and makes no changes. The elements/pages file seems re-ordered.

    This makes working together difficult. How should we handle this? Does anyone else have this problem?

  2. Kim
    Kim avatar
    2 posts
    Member since:
    Nov 2015

    Posted 31 Jan 2017 Link to this post

    I found my answer :p 
    We shouldn't check .pages in to source control because it is auto-generated. http://docs.telerik.com/teststudio/features/source-control/checkin-guidelines

    We will try that

  3. Elena Tsvetkova
    Admin
    Elena Tsvetkova avatar
    942 posts

    Posted 31 Jan 2017 Link to this post

    Hello Kim,

    Great to hear you found the answer on your own. This will certainly work for you! 

    Regards,
    Elena Tsvetkova
    Telerik by Progress
     
    Quickly become an expert in Test Studio, check out our new training sessions!
    Test Studio Trainings
     
Back to Top