'Copy to' function makes all files modified

christinelewis

I'm on 6.7.1

I have a sub-branch that was created some time ago. We need to merge all files in the main branch into that sub-branch.

The problem is when I take a copy of the main branch into a work area in the sub-branch all of the files show as modified. The dates are correct, in the past, but due to the fact that the files are modified they are X+ and when I submit them they overwrite the files in my sub-branch STAGING environment.

Is there a way to have the submit look at the date only? or some other way around this problem?

Adam Stoller

I'm on 6.7.1 I have a sub-branch that was created some time ago. We need to merge all files in the main branch into that sub-branch. The problem is when I take a copy of the main branch into a work area in the sub-branch all of the files show as modified. The dates are correct, in the past, but due to the fact that the files are modified they are X+ and when I submit them they overwrite the files in my sub-branch STAGING environment. Is there a way to have the submit look at the date only? or some other way around this problem?

There is no automatic cross-branch merge functionality - you should only copy changed files to your sub-branch's workarea - than you should compare the sub-branch's workarea against its staging area and take care of merging changes in the workarea before submitting them.

Going forward - you should probably develop a workflow process that propagates changes from the parent branch to the sub-branch after (presumably) approval so that you can keep the changes synchronized.