id	summary	reporter	owner	description	type	status	priority	milestone	component	version	resolution	keywords	cc
3103	resolve conflicts after combining just one conflict	dieterdreist	team	"The popup resolve conflicts after combining 2 ways displays just one conflict to resolve. All others are merged without explicit confirmation (e.g. tags that are just on one way)

"	defect	closed	major		Core	latest	fixed	resolve conflicts