How to resolve a conflict on svn:ignore property

From: Henri Dupre <henri.dupre_at_gmail.com>
Date: 2005-04-12 08:44:38 CEST

I can't figure out how to resolve a conflict on the svn:ignore property on
the root of my project using subclipse. The "team" context menu doesn't
offer "Edit conflict...".

Thanks,

Henri.
Received on Tue Apr 12 16:44:38 2005

This message: [ Message body ]
Next message: Jan Ploski: "Problem: Javahl interface is not available. Check your environment."
Previous message: Nikolaj Berntsen: "copy directory in version control using the navigator view"
Next in thread: Mark Phippard: "Re: How to resolve a conflict on svn:ignore property"
Maybe reply: Mark Phippard: "Re: How to resolve a conflict on svn:ignore property"

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