Sometimes when working on a solution I will move a module from one folder to another. This works perfectly when I'm the only one, working on a local solution. However, it causes issues when there is a team working on the same solution and the solution is being version controlled by Tortoise SVN.
Is there a correct procedure for moving modules locally, when the project will later be committed to an SVN?
Thanks!
Moving Modules when SVN Being Used
Re: Moving Modules when SVN Being Used
Hi,
There is not much you can do to avoid conflicts with multiple team members working on the same project. Probably the only thing you can do is to use lock-modify-unlock approach, as described >here<.
Of course, this approach requires that all team members work with versioned project. If you mean that your "local copy" is out of svn, it's completely wrong approach. You should definitely checkout the files from SVN and then, from time to time, do checkin. If you do not want to push all your minor changes to the main project branch, then create a side branch and push your changes there. When your changes are ready for main branch, merge your branch with main one. There may always be conflicts, which you will have to resolve manually. Hope this helps?
There is not much you can do to avoid conflicts with multiple team members working on the same project. Probably the only thing you can do is to use lock-modify-unlock approach, as described >here<.
Of course, this approach requires that all team members work with versioned project. If you mean that your "local copy" is out of svn, it's completely wrong approach. You should definitely checkout the files from SVN and then, from time to time, do checkin. If you do not want to push all your minor changes to the main project branch, then create a side branch and push your changes there. When your changes are ready for main branch, merge your branch with main one. There may always be conflicts, which you will have to resolve manually. Hope this helps?
Pavel Kudrys
Ranorex explorer at Descartes Systems
Please add these details to your questions:
Ranorex explorer at Descartes Systems
Please add these details to your questions:
- Ranorex Snapshot. Learn how to create one >here<
- Ranorex xPath of problematic element(s)
- Ranorex version
- OS version
- HW configuration
-
- Certified Professional
- Posts: 455
- Joined: Tue Feb 18, 2014 2:14 pm
- Location: Co Louth, Ireland
- Contact:
Re: Moving Modules when SVN Being Used
Thanks odklizec.
I had thought that Ranorex might have a guide or some info on "moving modules locally, when the project will later be committed to an SVN", but perhaps not.
This is something we have started doing.odklizec wrote:...If you do not want to push all your minor changes to the main project branch, then create a side branch and push your changes there. When your changes are ready for main branch, merge your branch with main one....
I had thought that Ranorex might have a guide or some info on "moving modules locally, when the project will later be committed to an SVN", but perhaps not.
- Support Team
- Site Admin
- Posts: 12145
- Joined: Fri Jul 07, 2006 4:30 pm
- Location: Houston, Texas, USA
- Contact:
Re: Moving Modules when SVN Being Used
Hi Fergal,
I am afraid there is no such guide from our site except the one odklizec already posted.
But I think you will find many useful articles in the internet when you google for how to best work in a team with a source controlled project.
Regards,
Markus
I am afraid there is no such guide from our site except the one odklizec already posted.
But I think you will find many useful articles in the internet when you google for how to best work in a team with a source controlled project.
Regards,
Markus