[josm-dev] Problem with large changeset

[Dirk Stöcker]

On Sun, 4 Jul 2010, Alan Mintz wrote:

> How can I tell it to simply accept my local version in bulk?

Why do you want? I gave you multiple ways to proceed. It looks like all 
your changes have been uploaded, so why do you want to bother with 
conflict resolution at all? This is only necessary when the upload was 
partial.

There is no easier version for conflict resolution yet.

Ciao
-- 
http://www.dstoecker.eu/ (PGP key available)