How to work in a big team using git

Question

Hi,&nbsp;we are working with about 25 people on&nbsp;a product that should be tested with soap-ui. We use git as repository and after some weeks of working with SOAU-UI I wonder how others deal with code repositories and big teams. The issue we are facing is, that if one opens the project (composite)&nbsp;many&nbsp;files (about 50 Files currently)&nbsp;are&nbsp;changed because of a timestamp lastOpend. If one adds a test case and runs it, almost all files (&gt; 150 Files) of the project are changed. This makes it very hard to find the files&nbsp;that are really changed related to my changes and if commit and push all files it is very likely that we have allot of conflicts.&nbsp;Are we the only ones that having that problem or did we do anything wrong?&nbsp;Regards,&nbsp;Christian

baxatob · Answer

Hi,
&nbsp;
As I understood, currently all of your team members are working in the trunk&nbsp;directory of your project.
The better way is to create a separate branch for each team member. Now all changes from particular user will be committed into its own branch. And you can always merge required&nbsp;branches&nbsp;with&nbsp;the main trunk as well as other can update their branches from there.

chauf · Answer

Hi,&nbsp;thanks for your quick answer. No we also work on branches but still if you got so many files that changes you need to take care what files to commit or you will&nbsp;face many conflicts when you&nbsp;want to merge the branch back into master.&nbsp;&nbsp;We all work in parallel and the branches are typically base on master. Because every files changes for example because of the lastOpend timestamp and not only the files I was realy working on it is very likely that the next one will have conflicts because his timestamp is different to mine and both are different to the master...&nbsp;regards,&nbsp;Christian

nmrao · Answer

chauf, may be you can take a look at the below thread to see if that is helpful.https://community.smartbear.com/t5/SoapUI-NG/Team-work-on-same-composite-project/m-p/121673/highlight/true#M28017

chauf · Answer

Hello Rao,&nbsp;yes this describes the behavior of conflicts but usually there are only conflicts in files that would be changed because of a change that was made by the developer. Because Ready API do change allot of files just because there where opened it there are many changes even if one doesn't change anything. This will cause conflicts anytime and will force us to merge all these files manually. This very painful. Most other Tolls save settings and meta-informations like the lastOpend Timestamp in separate files that can be ignored. In case of Subversion its .svn Folder or Eclipse you will find .metadata.&nbsp;Regards,&nbsp;Christian

hbjastad · Answer

Hi Christian, we're facing the same issue - but I don't have a solution. I'm surprised that SmartBear don't leave this metadata out, or at least store it elsewhere.

Forum Discussion

How to work in a big team using git

Related Content

API is not working using soapUI but is fine when API is called using Postman

Using property expansion in header param does not work

groovy script not working

Contains assertion with option "Use Token as regular expression" not working

Substring not working

Recent Discussions

How do I change password and Username on every call in a Test Case in SoapUI?

Content-Length calculation wrong when posting UTF-8 content

Error exception in phase 'semantic analysis' with java 21

Generate positive long integer?

How to test gi forms used in Intalio BPM process.