Maniphest T146344

Resolve conflicts on preferred language
Closed, ResolvedPublic1 Estimated Story Points
Actions

Description

Where 2 contacts have the same language variations should not prevent them merging. e.g

en vs en_US
en_CA vs en_US

Details

	Subject	Repo	Branch	Lines +/-
	Resolve conflicts on preferred language.	wikimedia/fundraising/crm	master	+125 -1

Customize query in gerrit

Related Objects
Search...

		Status	Subtype	Assigned	Task
		Resolved		None	T143057 Epic: Dedupe V2: resolve top conflicts
		Resolved		Eileenmcnaughton	T146344 Resolve conflicts on preferred language
		Resolved		Eileenmcnaughton	T149242 Resolve conflicts on preferred language where the languages differ - to most recent

Event Timeline

Eileenmcnaughton created this task.Sep 22 2016, 5:42 AM

Change 312182 had a related patch set uploaded (by Eileen):
Resolve conflicts on preferred language.

https://gerrit.wikimedia.org/r/312182

gerritbot added a project: Patch-For-Review.Sep 22 2016, 5:44 AM

Eileenmcnaughton mentioned this in T143057: Epic: Dedupe V2: resolve top conflicts.Sep 22 2016, 5:45 AM

• ggellerman set the point value for this task to 1.Sep 27 2016, 9:34 PM

• ggellerman moved this task from Triage to Sprint +1 on the Fundraising-Backlog board.

• DStrine moved this task from Sprint +1 to Current Sprint & Completed in Q1 1617 on the Fundraising-Backlog board.Sep 28 2016, 10:59 PM

• DStrine added a project: Fundraising Sprint Stirring The Pot.Sep 28 2016, 11:09 PM

Eileenmcnaughton moved this task from Backlog to Review on the Fundraising Sprint Stirring The Pot board.Oct 2 2016, 8:54 PM

Change 312182 merged by jenkins-bot:
Resolve conflicts on preferred language.

https://gerrit.wikimedia.org/r/312182

Ejegg moved this task from Review to Pending Deployment on the Fundraising Sprint Stirring The Pot board.Oct 12 2016, 8:16 PM

Ejegg moved this task from Pending Deployment to Done on the Fundraising Sprint Stirring The Pot board.Oct 12 2016, 10:08 PM

• DStrine added a project: Fundraising Sprint Testing on Production.Oct 12 2016, 11:05 PM

• DStrine moved this task from Current Sprint & Completed in Q1 1617 to Completed in Q2 1617 on the Fundraising-Backlog board.Oct 13 2016, 4:41 PM

Ejegg moved this task from Backlog to Done on the Fundraising Sprint Testing on Production board.Oct 21 2016, 6:25 PM

Ejegg closed this task as Resolved.Oct 21 2016, 6:46 PM

Eileenmcnaughton created subtask T149242: Resolve conflicts on preferred language where the languages differ - to most recent.Oct 26 2016, 9:12 PM

Eileenmcnaughton closed subtask T149242: Resolve conflicts on preferred language where the languages differ - to most recent as Resolved.Nov 1 2016, 8:03 PM