I added very basic editing capabilities to my gosmore program yesterday and today I "took them for a spin".

During the 90 minute cycling trip I edited 6 ways and 65 nodes, most of them being either amenity=fuel or highway=traffic_signal. The former could all be uploaded without intervention, while the latter required to be merged with the existing node which was very easy with JOSM.