Problems with recordings ID in GIT

Ask general questions here.
User avatar
lb3d
Posts: 1
Joined: Tue Sep 17, 2019 11:16 am

Problems with recordings ID in GIT

Post by lb3d » Tue Sep 17, 2019 11:23 am

Hi all,

I noticed a problem when more people work on same project at same time. We are using Git Extensions and if two people add new recording, the ID is not dynamic (both new recordings have exactly the same ID), and this causes problems when merging. Is there a way how to avoid these situations? :?: :?:

Thanks.

User avatar
qwertzu
Posts: 276
Joined: Wed Jan 25, 2017 11:08 am

Re: Problems with recordings ID in GIT

Post by qwertzu » Thu Sep 19, 2019 11:17 am

Hi lb3d,

I hardly, think that two recordings with the exact same ID have been created since this is hardly possible.
(As a reference, see this link: https://stackoverflow.com/questions/184 ... ble/185001).
I guess you face some other conflict. Maybe you can provide some more details?

Also make sure to use the Magic Merger which resolves many conflicts of test suite, repository and project files automatically.

regards, qwertzu