[cvsnt] How to check the merge state of a branch?

Glen Starrett grstarrett at cox.net
Tue Nov 4 16:52:10 GMT 2003


> >Or is there a safeguard such that if I merge once more from 
> TRUNK I will be
> >sure that the earlier edits are not reapplied and only those 
> files still in
> >need of a merge will be updated/added/removed?
> 
> As long as you commit to the branch afterward it'll keep the
> mergepoint.

I do this all the time, back and forth from my dev branch to the trunk.  It
works flawlessly for me.

Regards,

Glen Starrett




More information about the cvsnt mailing list