Patching your own work

Greetings.

I understand how 2 users working on the same file would need to resolve
their changes at check-in time.

However, I do not understand how to do it if only one person is working
with the repository; the vendor is sending out patches at the same time
I am making changes.

I need to resolve the differences and create a new version. Diff'ing the
files won't work...it needs to create the comparisons that I can use to
resolve the differences.
Received on Fri Mar 18 19:40:09 2005