[OSM-newbies] JOSM and conflicts

[Steve Bennett]

Ok, so I just did a bunch of changes in JOSM, and when trying to
upload them, it tells me they all conflict, because there is a newer
version on the server. Which is extremely unlikey of course. So...

1) Is there a way to automatically overwrite all the server changes?
(Manually resolving every conflict looks extreeeeemely painful,
especially when they involve ways not just nodes...)
2) How do I prevent this happenening again?

Maybe I pushed the wrong button, the sequence of events was something like:
1) "Download OSM Data", select some data, start downloading...whoops,
cancel, I don't want to overwrite my changes.
2) "Update Data" (thinking that would upload my changes), whoops, cancel.
3) Upload Data.

Steve