How to work in a big team using git
Hi, we are working with about 25 people on 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 r...
Forum Discussion
Hi,
As I understood, currently all of your team members are working in the trunk 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 branches with the main trunk as well as other can update their branches from there.
Hi,
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 face many conflicts when you want to merge the branch back into master.
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...
regards,
Christian
- 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#M28017Hello Rao,
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.
Regards,
Christian
