"Joseph A. Nagy, Jr" <jnagyjr1...@gmail.com> wrote:
I know when I run it manually and there is a conflict, it will tell me about a merge-conflict and ask me which file to keep (mine or theirs), selecting theirs, afaik, overwrites my local file.
And when there is no conflict and it can be merged, you have a merged file. And in some point in time your local /usr/ports is messed up with forgotten local changes and so on... I just wanna make sure to automatically "clean up" my /usr/ports. CVSup did this :( _______________________________________________ freebsd-ports@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-ports To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org"
