[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[sc-users] Re: MIDIIn helpfile corrupted?

To: sc-users@xxxxxxxxxxxxxxx
Subject: [sc-users] Re: MIDIIn helpfile corrupted?
From: Rohan Drape <rd@xxxxxxxxxxxxxxxx>
Date: Fri, 24 Dec 2004 02:56:09 -0000
Cc: tom@xxxxxxxxxxx
List-archive: <http://www.create.ucsb.edu/pipermail/sc-users>
List-help: <mailto:sc-users-request@create.ucsb.edu?subject=help>
List-id: SuperCollider users mailing list <sc-users.create.ucsb.edu>
List-post: <mailto:sc-users@create.ucsb.edu>
List-subscribe: <http://www.create.ucsb.edu/mailman/listinfo/sc-users>, <mailto:sc-users-request@create.ucsb.edu?subject=subscribe>
List-unsubscribe: <http://www.create.ucsb.edu/mailman/listinfo/sc-users>, <mailto:sc-users-request@create.ucsb.edu?subject=unsubscribe>
Reply-to: SuperCollider users mailing list <sc-users@xxxxxxxxxxxxxxx>
Sender: rohan@xxxxxxxxxxxxxxxxx
User-agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3

> From latest cvs, mine begins:
> <<<<<<< MIDIIn.help.rtf=======>>>>>>> 1.9MIDIIn

This is the CVS mechanism for indicating a conflict.

Due to the way RTF files are generated they do not merge well.

When using CVS you can't really edit the RTF files in the SC tree,
unless of course you intend to commit the changes.

If you edit such a file by accident just delete it and update again.

Regards,
Rohan

Prev by Date: [sc-users] MIDIIn helpfile corrupted?
Next by Date: [sc-users] commit: ObjectSpec
Previous by thread: Re: [sc-users] [swiki][crucial?] list search not working
Next by thread: [sc-users] commit: ObjectSpec
Index(es):
- Date
- Thread