[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Moving files onto an existing branch

From: Kaz Kylheku
Subject: Re: Moving files onto an existing branch
Date: Mon, 11 Feb 2002 07:33:29 GMT
User-agent: slrn/ (Linux)

In article <address@hidden>, Dan Langille wrote:
>I have files which exist on the main trunk but not on the branch.  I'd like
>them to exist on the branch as well.

That flies against the principles of intelligent version control.
Changes are merged from the branch to the trunk, not the other way

You must re-think the way you approach version control.

So what hapened is that some people went on a branch, and in the meanwhile
the trunk acquired some nice features that the branch people would like
to integrate with.

The proper way to integrate is to merge the branch to the trunk.  If the
branch is experimental, you don't have to commit the results for that
merge to the trunk; you can start a new branch and commit the merge
results there.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]