4 commits

Author	SHA1	Message	Date
Achilleas Pipinellis	b72f43d053	Add docs for resolve conflicts editor ... [ci skip]	2017-01-24 17:23:47 +01:00
Sean McGivern	44eb3197a9	Handle non-UTF-8 conflicts gracefully ... These can't be resolved in the UI because if they aren't in a UTF-8 compatible encoding, they can't be rendered as JSON. Even if they could, we would be implicitly changing the file encoding anyway, which seems like a bad idea.	2016-08-25 08:27:08 +01:00
Achilleas Pipinellis	2257fda38e	Reference the version 'UI resolve conflicts' was introduced ... [ci skip]	2016-08-17 15:34:53 +03:00
Sean McGivern	b79378cae8	Add merge conflict docs	2016-08-12 23:24:49 +03:00