On Wed, Jan 7, 2009 at 5:13 PM, <postmaster_at_tigris.org> wrote:
>>> I end up with:
>>> I expect the merge to fail, as it can not (nor do I expect it to) manage the merging of binary files.
>>> I can work out which one I want, but I've yet to work out how to get subclipse to allow me to manage the process. How/what do I select to resolve the differences?
>>> The only means that I've worked out so far is deleting and renaming as appropriate - which is not pleasant!
>>Items that have conflicts show up in the Eclipse Problems view as an
>>SVN conflict. There is a quick fix option attached to that which has
>>support for Choose Mine/Choose Theirs.
> So can I always assume that the merge-left is mine, and merge-right is theirs (or visa versa)?
Yes. There are a couple of sections in the book that explain it:
Note that the filenames are different based on whether the conflict is
produced by merge versus update/switch.
Received on 2009-01-07 23:37:45 CET