Hello,
I have a "main trunk" and a branch "R18". Some changes (on 3 files) have
been made by programmer on the main trunk but they should have been done in
the R18 branch. I'd like the changes made on the three files to be merged
(or just copied) to the R18 branch. Of course, the R18 branch should
If both main trunk and branch R18 are in sync till now, then you can
merge the changes with following with branch as working copy.
cvs update -j HEAD -j R18
This also assumes that there are no commits to main trunk after your
required changes. otherwise they will also be merged into the branch.
news wrote:
> I have a "main trunk" and a branch "R18". Some changes (on 3
> files) have been made by programmer on the main trunk but
> they should have been done in the R18 branch. I'd like the
> changes made on the three files to be merged (or just copied)
> to the R18 branch. Of course, the
Hello,
"Rohan Nandode" <[EMAIL PROTECTED]> a écrit dans le message de
news:[EMAIL PROTECTED]
> If both main trunk and branch R18 are in sync till now, then you can
> merge the changes with following with branch as working copy.
>
> cvs update -j HEAD -j R18
Thank you very much. It was the main t
Hello,
"Jim.Hyslop" <[EMAIL PROTECTED]> a écrit dans le message de
news:[EMAIL PROTECTED]
> Fixing this will be quite simple. For simplicity, I will assume that there
...
Thank you very much for this method. I didn't know it was possible to merge
2 versions in the same branch. I have to read some
