RE: To Merge or copy a feature branch?

> I have created a branch for a new feature I am working on and am now
> ready to merge my branch back to the trunk.
> All files of the new work (But for a couple) are in a new sub
> directory.
>
> Ie.
> I have;
> trunk/project1
> branches/project1/feature1
>
> I was thinking of simply copying the feature1 folder and all contents
> into trunk/project1 (via svn copy) as opposed to doing a merge...
> Is this a good practice? Or should I perform the needed task via a
> merge operation?

I don't understand... why did you add the feature1 folder in the branch? Is that going to end up in trunk?

It seems to me if you copy feature1 to trunk then you will have a problem. Or, did you mean you want to copy branches/project1/feature1 to trunk/project1/feature1 ???

BOb

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2395574

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-16 16:11:50 CEST