I'm in the process of refactoring some code which includes moving folders around, and I would like to regularly merge to keep things current. What is the best way to merge after I've moved folders around in my working copy?
我正在重构一些包含移动文件夹的代码,我想定期合并以保持最新状态。在我的工作副本中移动文件夹后,合并的最佳方法是什么?
5 个解决方案
#1
3
You can move the files around in StarTeam also. Then merge after that.
您也可以在StarTeam中移动文件。然后合并。
Whatever you do, make sure you don't delete the files and re-add in StarTeam. You'll lose the file history if you do that.
无论您做什么,请确保不删除文件并重新添加StarTeam。如果你这样做,你将丢失文件历史记录。
#2
3
Moving the files in StarTeam and then updating your project/solution is the cleaner way to go. I would also suggest creating a view label prior to doing anything so you have a definite "roll back" point if things go wrong :)
在StarTeam中移动文件,然后更新项目/解决方案是更简洁的方法。我还建议在做任何事情之前创建一个视图标签,这样如果出现问题你就会有一个明确的“回滚”点:)
#3
1
Folders in StarTeam can be renamed to match the filesystem moves by right clicking the folder and going to Properties. If you created new nesting levels, you will have to create those folders normally. If you moved files between existing folders, you can move those in StarTeam by dragging them from the file window on the right to the new folder on the left. Files can be renamed to match a new name in StarTeam the same way folders are, right click the file and select Properties.
通过右键单击文件夹并转到“属性”,可以重命名StarTeam中的文件夹以匹配文件系统移动。如果您创建了新的嵌套级别,则必须正常创建这些文件夹。如果您在现有文件夹之间移动文件,则可以通过将它们从右侧的文件窗口拖动到左侧的新文件夹来移动StarTeam中的文件。可以重命名文件以匹配StarTeam中的新名称,方法与文件夹相同,右键单击文件并选择“属性”。
As a fellow StarTeam user, my condolences go out to you.
作为StarTeam用户,我向你表示哀悼。
#4
1
In an ideal world, you could branch the view and merge back when you are happy with your revisions to avoid breaking the build. However, as you are using StarTeam, I would suggest making small incremental changes to the folder structure and accept that you will probably have a few breakages along the way. It will likely be less time consuming and more intuitive than trying to use the view-merge interface.
在理想的世界中,当您对修订版感到满意时,可以对视图进行分支并合并,以避免破坏构建。但是,当您使用StarTeam时,我建议对文件夹结构进行小的增量更改,并接受在此过程中可能会有一些破损。与尝试使用视图合并界面相比,它可能更省时,更直观。
#5
0
The problem is I'm worried about breaking the build in the meantime while I'm moving folders in StarTeam. I suppose the only way to avoid that is to be ready to upload updated project files as soon as I move things around in StarTeam and do it as quickly as possible.
问题是当我在StarTeam中移动文件夹时,我担心在此期间破坏构建。我想避免这种情况的唯一方法是,一旦我在StarTeam中移动并尽快完成,就准备上传更新的项目文件。
#1
3
You can move the files around in StarTeam also. Then merge after that.
您也可以在StarTeam中移动文件。然后合并。
Whatever you do, make sure you don't delete the files and re-add in StarTeam. You'll lose the file history if you do that.
无论您做什么,请确保不删除文件并重新添加StarTeam。如果你这样做,你将丢失文件历史记录。
#2
3
Moving the files in StarTeam and then updating your project/solution is the cleaner way to go. I would also suggest creating a view label prior to doing anything so you have a definite "roll back" point if things go wrong :)
在StarTeam中移动文件,然后更新项目/解决方案是更简洁的方法。我还建议在做任何事情之前创建一个视图标签,这样如果出现问题你就会有一个明确的“回滚”点:)
#3
1
Folders in StarTeam can be renamed to match the filesystem moves by right clicking the folder and going to Properties. If you created new nesting levels, you will have to create those folders normally. If you moved files between existing folders, you can move those in StarTeam by dragging them from the file window on the right to the new folder on the left. Files can be renamed to match a new name in StarTeam the same way folders are, right click the file and select Properties.
通过右键单击文件夹并转到“属性”,可以重命名StarTeam中的文件夹以匹配文件系统移动。如果您创建了新的嵌套级别,则必须正常创建这些文件夹。如果您在现有文件夹之间移动文件,则可以通过将它们从右侧的文件窗口拖动到左侧的新文件夹来移动StarTeam中的文件。可以重命名文件以匹配StarTeam中的新名称,方法与文件夹相同,右键单击文件并选择“属性”。
As a fellow StarTeam user, my condolences go out to you.
作为StarTeam用户,我向你表示哀悼。
#4
1
In an ideal world, you could branch the view and merge back when you are happy with your revisions to avoid breaking the build. However, as you are using StarTeam, I would suggest making small incremental changes to the folder structure and accept that you will probably have a few breakages along the way. It will likely be less time consuming and more intuitive than trying to use the view-merge interface.
在理想的世界中,当您对修订版感到满意时,可以对视图进行分支并合并,以避免破坏构建。但是,当您使用StarTeam时,我建议对文件夹结构进行小的增量更改,并接受在此过程中可能会有一些破损。与尝试使用视图合并界面相比,它可能更省时,更直观。
#5
0
The problem is I'm worried about breaking the build in the meantime while I'm moving folders in StarTeam. I suppose the only way to avoid that is to be ready to upload updated project files as soon as I move things around in StarTeam and do it as quickly as possible.
问题是当我在StarTeam中移动文件夹时,我担心在此期间破坏构建。我想避免这种情况的唯一方法是,一旦我在StarTeam中移动并尽快完成,就准备上传更新的项目文件。