Maniphest T158083

Allow ignoring the conflict
Closed, DuplicatePublic
Actions

Assigned To

None

Authored By

	WMDE-Fisch
	Feb 14 2017, 6:07 PM

Tags

Referenced Files

None

Subscribers

Nenntmichruhigip

Description

As a user I want to ignore the conflict in some cases and just want to have a straightforward way to save my version.

see: https://www.mediawiki.org/wiki/Topic:Tl0e3st5rqwsvv6o

Related Objects
Search...

		Status	Subtype	Assigned	Task
		Open		None	T72163 Edit conflicts (tracking)
		Resolved		None	T139601 Better solutions to edit conflicts (#1)
		Duplicate		None	T158083 Allow ignoring the conflict

Event Timeline

WMDE-Fisch created this task.Feb 14 2017, 6:07 PM

Restricted Application added a subscriber: Aklapper. · View Herald TranscriptFeb 14 2017, 6:07 PM

WMDE-Fisch added a subscriber: Nenntmichruhigip.Feb 14 2017, 6:11 PM

WMDE-Fisch moved this task from Incoming to Edit Conflict Handling on the TCB-Team (now WMDE-TechWish) board.Feb 14 2017, 6:18 PM

WMDE-Fisch added a parent task: T139601: Better solutions to edit conflicts (#1).Feb 28 2017, 6:24 PM

Cirdan subscribed.Mar 9 2017, 8:32 PM

This is possible with the new option to choose their base version for the merge.

thiemowmde removed a project: TCB-Team (now WMDE-TechWish).Jan 7 2022, 3:26 PM