cancel
Showing results for 
Search instead for 
Did you mean: 

Git Integration and different users

SOLVED
Cekay
Contributor

Git Integration and different users

Huhu 😃

 

I used to work alone on my project so I never had the problem before.

Are some you working on one projects with more than person? How do you avoid to overwrite changes from other testers?

Some of my new colleques used to have those problems (but with SVN)

 

I found this: https://community.smartbear.com/t5/API-Functional-Security-Testing/Tactics-to-Overcome-Git-Version-C... but I hope the integration was improved by now?

 

Thank you and Cheers,

Cekay

1 ACCEPTED SOLUTION

Accepted Solutions
richie
Community Hero

Re: Git Integration and different users

Hey @Cekay,

ReadyAPI! supports creating project files in two formats:

1 single flat .xml file
Multiple unflattened files (known as a composite).

You just alter the project type property to composite and ReadyAPI does the work for you. Because its a composite, this allows multiple users to update the same project simultaneously. You dont have to use Git integration to maintain the versioning of your composite project, but if you do, then Git will handle all the adds/commits/pushes/merges for you users simultaneous changes as well as handling any merge comflicts if your users simultaneous updates attempt to alter the same object in your project.

Hope thie helps

Rich
if this helped answer the post, could you please mark it as 'solved'? Also if you consider whether the title of your post is relevant? Perhaps if the post is solved, it might make sense to update the Subject header field of the post to something more descriptive? This will help people when searching for problems. Ta

View solution in original post

2 REPLIES 2
richie
Community Hero

Re: Git Integration and different users

Hey @Cekay,

ReadyAPI! supports creating project files in two formats:

1 single flat .xml file
Multiple unflattened files (known as a composite).

You just alter the project type property to composite and ReadyAPI does the work for you. Because its a composite, this allows multiple users to update the same project simultaneously. You dont have to use Git integration to maintain the versioning of your composite project, but if you do, then Git will handle all the adds/commits/pushes/merges for you users simultaneous changes as well as handling any merge comflicts if your users simultaneous updates attempt to alter the same object in your project.

Hope thie helps

Rich
if this helped answer the post, could you please mark it as 'solved'? Also if you consider whether the title of your post is relevant? Perhaps if the post is solved, it might make sense to update the Subject header field of the post to something more descriptive? This will help people when searching for problems. Ta

View solution in original post

Cekay
Contributor

Re: Git Integration and different users

Thank you. I hoped for more insight from users which actually are working on the same project.

 

In theory I know all of that and my project is a composite project 😃 But like I said, I used to work alone and even than I lost some of my changes because of merges and had to rewrite those tests. I am not very advanced in GIT nor in SoapUI. :X I am (now) able to create my tests in a branch and merge that to develop/master. I even store most of my variable locally so they won't get saved but unfortunatelly that is not possible for everything.

So what I expect to happen if my colleques will start running and writing tests too, that we will get a lot of merge conflict and lost code. ^^ But I think we will see

New Here?
Join us and watch the welcome video:
Announcements
Top Kudoed Authors