portsnap - overwrite local changes

Oliver Lehmann lehmann at ans-netz.de
Tue Jan 22 15:59:58 UTC 2013

"Joseph A. Nagy, Jr" <jnagyjr1978 at 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 :(

More information about the freebsd-ports mailing list