hi there,
every now and then i encounter some conflicts in my work with subversion and currently it's the only operation i cannot entirely manage from within TM (which is real shame, because the actual process of resolving the conflict has gotten a lot easier through TM and the diff-coloring!)
here's hoping ;-)
tom
p.s. the new cocoa status report is neat! -- Tom Lazar http://tomster.org
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
On May 30, 2005, at 1:41 PM, Tom Lazar wrote:
every now and then i encounter some conflicts in my work with subversion and currently it's the only operation i cannot entirely manage from within TM (which is real shame, because the actual process of resolving the conflict has gotten a lot easier through TM and the diff-coloring!)
thanks, chris! much appreciated ;-)
(revision 1154 now has the resolved command included in the subversion bundle) - -- Tom Lazar, http://tomster.org
-
Tom Lazar