Contributions
Re: How to work in a big team using git
Hello 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, Christian2.9KViews0likes1CommentRe: How to work in a big team using git
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 willface many conflicts when youwant 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, Christian3KViews0likes3CommentsHow to work in a big team using git
Hi, we are working with about 25 people ona 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)manyfiles (about 50 Files currently)arechanged because of a timestamp lastOpend. If one adds a test case and runs it, almost all files (> 150 Files) of the project are changed. This makes it very hard to find the filesthat are really changed related to my changes and if commit and push all files it is very likely that we have allot of conflicts. Are we the only ones that having that problem or did we do anything wrong? Regards, Christian3KViews0likes5Comments