[Top][All Lists]

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

Merging a branch with the main trunk.

From: Jacob Burckhardt
Subject: Merging a branch with the main trunk.
Date: Fri, 31 Aug 2001 18:37:44 -0700

address@hidden writes:
> Hi,
> I'm using winCVS ( beta 4 (local Build 3)).
> I have a branch "test_branch" with changes on files that was "branched out"
> from the main trunk. 
> I also add new folders and files to this test_branch.
> When I'm trying to merge test_branch into the main trunk, the changed files
> are merged ok, but the new folders and files don't "merge" into the main
> trunk. Are new files in test_branch supposed to get added into the main
> trunk with the merge? Or how are these new files from the test_branch
> supposed to be added into the main trunk?

The posting at the following URL explains how to do that:

> Kjetil F Svingen 
> _______________________________________________
> Info-cvs mailing list
> address@hidden

reply via email to

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