Hmm... I assume this was not intentional.
What happened?
Regards
Henrik
sön 2007-03-18 klockan 09:51 + skrev Amos Jeffries:
Log Message:
merge updates from HEAD lost in earlier update.
Index: projects.html
===
RCS
Hmm... I assume this was not intentional.
What happened?
Regards
Henrik
I went:
cvs -q update
cvs commit
without noticing that the update had created a merge-clash patch for the
changes you had made.
When I found the .# patch file with your updates I checked and merged my
update into
tis 2007-03-20 klockan 11:57 +1200 skrev [EMAIL PROTECTED]:
I went:
cvs -q update
cvs commit
without noticing that the update had created a merge-clash patch for the
changes you had made.
Did it? If there is conflicts then cvs update says so, and they get
clearly marked in the file with
