id	summary	reporter	owner	description	type	status	priority	milestone	component	version	resolution	keywords	cc
12697	Improve conflicts window usability	jbcorbeille-josm@…	team	"==== What steps will reproduce the problem?
1. Find a conflict when editing, and open the conflict window (« Résoudre les conflits » in French)
2. Resolve the conflicting elements
3. You then want to close the window. But Enter key undoes what was just done, and CTRL+Enter does the same. 

I think a keyboard shortcut should allow to close the conflict window when the conflict is resolved, instead of needing to use the mouse. I would suggest Enter or CTRL+Enter .

==== What is the expected result?

==== What happens instead?

==== Please provide any additional information below. Attach a screenshot if possible.

{{{
URL:http://josm.openstreetmap.de/svn/trunk
Repository:UUID: 0c6e7542-c601-0410-84e7-c038aed88b3b
Last:Changed Date: 2016-03-13 01:17:21 +0100 (Sun, 13 Mar 2016)
Build-Date:2016-03-13 02:35:00
Revision:9979
Relative:URL: ^/trunk

Identification: JOSM/1.5 (9979 fr) Windows 7 64-Bit
Memory Usage: 247 MB / 247 MB (47 MB allocated, but free)
Java version: 1.8.0_45-b15, Oracle Corporation, Java HotSpot(TM) Client VM
Dataset consistency test: No problems found

Plugins:
- DirectUpload (31912)
- apache-commons (31895)
- continuosDownload (1446070193)
- download_along (31772)
- ejml (31895)
- geotools (31895)
- jts (31772)
- opendata (32071)
- poly (31772)
- reltoolbox (31895)
- reverter (32005)
- scripting (30722)
- utilsplugin2 (32099)

Last errors/warnings:
- W: org.openstreetmap.josm.io.OsmTransferException: Impossible de joindre le serveur. Veuillez vérifier votre connexion Internet.. Cause : java.net.UnknownHostException: api.openstreetmap.org
- W: java.net.UnknownHostException: api.openstreetmap.org
- W: Already here java.net.UnknownHostException: api.openstreetmap.org
- E: java.net.UnknownHostException: api.openstreetmap.org
- W: org.openstreetmap.josm.io.OsmTransferException: Impossible de joindre le serveur. Veuillez vérifier votre connexion Internet.. Cause : java.net.UnknownHostException: api.openstreetmap.org
}}}
"	enhancement	new	minor		Core			template_report