Re: To Merge or copy a feature branch?

On Wed, Sep 16, 2009 at 01:46, Gavin Baumanis <gavinb_at_eclinic.com.au> wrote:
> Hi Everyone,
>
> 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?

Do it as a merge. Otherwise anything that's happened in trunk will be
lost (unless you've been merging trunk into the branch regularly). And
either way, doing it as a merge will keep the history cleaner & more
correct.

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

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