This is a migrated thread and some comments may be shown as answers.

How to handle merge conflicts in the pages file

2 Answers 108 Views
General Discussions
This is a migrated thread and some comments may be shown as answers.
This question is locked. New answers and comments are not allowed.
Kim
Top achievements
Rank 1
Kim asked on 30 Jan 2017, 08:47 AM

 

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 Answers, 1 is accepted

Sort by
0
Kim
Top achievements
Rank 1
answered on 31 Jan 2017, 01:34 PM

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

0
Elena
Telerik team
answered on 31 Jan 2017, 04:45 PM
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
 
Tags
General Discussions
Asked by
Kim
Top achievements
Rank 1
Answers by
Kim
Top achievements
Rank 1
Elena
Telerik team
Share this question
or