Re: Forcing conflict on a three-way diff.

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2005-09-15 21:56:00 CEST

On Sep 15, 2005, at 2:47 PM, Erik Enge wrote:

> Thanks to Robert Swarbrick for helping me understand the intended
> behavior of how Subversion merges during a three-way diff. The result
> is that I would like to always force a conflict when there's a
> three-way diff so I have my .mine, .revOLD, .revNEW files dumped in
> the directory and can do the merge manually.

Just set the file's svn:mime-type property to something non-texty,
like application/octet-stream.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Sep 15 21:58:07 2005

This message: [ Message body ]
Next message: Erik Enge: "Re: Forcing conflict on a three-way diff."
Previous message: Erik Enge: "Forcing conflict on a three-way diff."
In reply to: Erik Enge: "Forcing conflict on a three-way diff."
Next in thread: Erik Enge: "Re: Forcing conflict on a three-way diff."
Reply: Erik Enge: "Re: Forcing conflict on a three-way diff."

Contemporary messages sorted: [ By Date ] [ By Thread ] [ By Subject ] [ By Author ] [ By messages with attachments ]