Source Control is difficult with Test Studio scripts

[Anna]

My diffs are a bit cryptic and are the reason why I may not use Test Studio for my next project.
Is this normal? How am I supposed to work with multiple people on the same automation project? 


diff --cc BitBucketTestProj2/ESOLogin2.resx

index 6cfeccf,484ae57..0000000

--- a/BitBucketTestProj2/ESOLogin2.resx

+++ b/BitBucketTestProj2/ESOLogin2.resx

@@@ -9993,7 -9993,7 +9993,11 @@@

          AAAAAAAAAAAAAAAL

  </value>

    </data>

++<<<<<<< HEAD

+  <data name="ESOLogin2lfquxuzk.sjt" type="System.Resources.ResXNullRef,
Syste

++=======

+   <data name="ESOLogin2b0r4btbx.xty" type="System.Resources.ResXNullRef,
Syste

++>>>>>>> 7c8c731dc6459539d578f9cd5c0f7d9c4e41813d

      <value />

    </data>

  </root>

diff --cc BitBucketTestProj2/ESOLogin2.tstest

index f1e3e74,49bb012..0000000

--- a/BitBucketTestProj2/ESOLogin2.tstest

+++ b/BitBucketTestProj2/ESOLogin2.tstest

@@@ -1,1 -1,1 +1,5 @@@

- {"__type":"ArtOfTest.WebAii.Design.ProjectModel.Test","__value":{"DomStatesCou

-{"__type":"ArtOfTest.WebAii.Design.ProjectModel.Test","__value":{"DomStatesCou

++<<<<<<< HEAD

++{"__type":"ArtOfTest.WebAii.Design.ProjectModel.Test","__value":{"DomStatesCou

++=======

++{"__type":"ArtOfTest.WebAii.Design.ProjectModel.Test","__value":{"DomStatesCou

++>>>>>>> 7c8c731dc6459539d578f9cd5c0f7d9c4e41813d

(END)

[Cody]

Hi Anna,

I just answered this yesterday in your private support ticket. For the benefit of the rest of our customers, here's a copy of my response:

You can have two people working in the same project at the same time... but what you can't do is have two people working on the same test at the same time. Test Studio tests are stored in proprietary JSON format and changes cannot be merged. They're not like source code files (which are essentially text files) in which it's possible to merge changes.

I can tell by the output from git that two people changed the same test at the same time. You must discard one and keep the other.

Just make sure that different people are assigned to work on different tests and you should be fine.

Regards,
Cody
Telerik