czyzyk29
Contributor
Joined 11 years ago
User Profile
User Widgets
Contributions
git integration
Hi, I want to change SVN for Git. Take information from https://github.com/SmartBear/ready-git-plugin/wiki Unfortunately have probelem with pull changes with other user. I have user1 and user2, the have the same repo -> update from repo. Now user1 having changes and user2 having changes. User1 finish his job and pull changes - everithing is ok. Now user2 finish his job too and he want to pull changes and see window to merge conflicts. There are 2 options 'ours' or 'theirs' chanages. When he choose ours - user2 changes stay and user1 changes lost When he choose theirs - user2 changes lost and user1 changes stay. I want to merge changes - plugin implementation do not support this, it give you only choise bettwen stay and lose changes. Do you have any ideas for that?Solved3.7KViews0likes4CommentsProblem with content assertion - testrunner/soap ui
Hi, I have content assertion for value 50000 - in responce soap ui in json view have 50000 - in responce soap ui in outline view have 50000.0 - in assertion for this value have 50000 when run test - in soap ui assertion is ok - in testrunner have error - soap ui expecting 50000 actual was 50000.0 anyone ?2.1KViews0likes5CommentsTestsuits with '-' first save
add new testsuite with name 'my testsuite' from service (add to TestCase) from Projects in Soap UI NG click save on this TS first time, my TS (folder name) is 'my-testsuite' save second time, my TS (folder name) is 'my testsuite' why Soap ui add '-' first time? this is problem for svn with composite project any ideas?2.2KViews0likes7Comments