Page MenuHomePhabricator
Create Task
Maniphest T175748

Implement merge rule to allow resolution on conflicts on punctuation to prefer more punctuation
Closed, ResolvedPublic1 Estimated Story Points
Actions

Details

ProjectBranchLines +/-Subject
wikimedia/fundraising/crmmaster+84 -69Function extraction
wikimedia/fundraising/crmmaster+21 -2Resolve conflicts on asymetrical punctuation when merging
Customize query in gerrit

Related Objects
Search...

Event Timeline

Eileenmcnaughton created this task.Sep 12 2017, 8:26 PM
• DStrine moved this task from Triage to Sprint +1 on the Fundraising-Backlog board.Sep 19 2017, 6:22 PM
• DStrine moved this task from Sprint +1 to Current Sprint and Completed in Q1 2017-18 on the Fundraising-Backlog board.Sep 26 2017, 8:29 PM
• DStrine added a project: Fundraising Sprint Synchronized Screaming.Sep 26 2017, 8:46 PM
Eileenmcnaughton moved this task from Backlog to Doing on the Fundraising Sprint Synchronized Screaming board.Sep 26 2017, 9:11 PM
gerritbot added a subscriber: gerritbot.Oct 4 2017, 4:11 AM

Change 382109 had a related patch set uploaded (by Eileen; owner: Eileen):
[wikimedia/fundraising/crm@master] Resolve conflicts on asymetrical whitespace when merging

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

gerritbot added a project: Patch-For-Review.Oct 4 2017, 4:11 AM
Eileenmcnaughton moved this task from Doing to Review on the Fundraising Sprint Synchronized Screaming board.Oct 4 2017, 4:12 AM
gerritbot added a comment.Oct 4 2017, 4:38 AM

Change 382110 had a related patch set uploaded (by Eileen; owner: Eileen):
[wikimedia/fundraising/crm@master] Function extraction

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

XenoRyet moved this task from Review to Pending Deployment on the Fundraising Sprint Synchronized Screaming board.Oct 6 2017, 4:34 PM
gerritbot added a comment.Oct 6 2017, 4:40 PM

Change 382109 merged by jenkins-bot:
[wikimedia/fundraising/crm@master] Resolve conflicts on asymetrical punctuation when merging

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

gerritbot added a comment.Oct 6 2017, 6:55 PM

Change 382110 merged by jenkins-bot:
[wikimedia/fundraising/crm@master] Function extraction

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

Eileenmcnaughton moved this task from Pending Deployment to Done on the Fundraising Sprint Synchronized Screaming board.Oct 10 2017, 1:45 AM
Eileenmcnaughton closed this task as Resolved.Oct 10 2017, 7:29 PM
Eileenmcnaughton set the point value for this task to 1.Oct 10 2017, 7:59 PM
Content licensed under Creative Commons Attribution-ShareAlike 3.0 (CC-BY-SA) unless otherwise noted; code licensed under GNU General Public License (GPL) or other open source licenses. By using this site, you agree to the Terms of Use, Privacy Policy, and Code of Conduct. · Wikimedia Foundation · Privacy Policy · Code of Conduct · Terms of Use · Disclaimer · CC-BY-SA · GPL