id	summary	reporter	owner	description	type	status	priority	milestone	component	version	resolution	keywords	cc
7749	undoing conflict resolution is not possible	Cobra	Cobra	"It's not possible to undo a conflict resolution, getting the state before the conflict.

The undo/redo stack changes, but the data and conflict list is still the same."	defect	closed	blocker		Core	latest	needinfo