[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: merging from the branch and conflicts impossible !!!
|
From: |
Casper |
|
Subject: |
Re: merging from the branch and conflicts impossible !!! |
|
Date: |
18 Sep 2005 11:30:09 -0700 |
|
User-agent: |
G2/0.2 |
aaaargh sorry, me stupid I merged from merge point on the trunk to the
last merged-from on the branch.
The correct way is:
[trunk]$ cvs update -j FROM -j TO file.txt
where FROM and TO are *both* on the branch, e.g.:
cvs update -j rel_5_0_1 -j rel_5_0_2