Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[REF] extract getConflicts function #14148

Merged
merged 1 commit into from
Apr 28, 2019

Conversation

eileenmcnaughton
Copy link
Contributor

@eileenmcnaughton eileenmcnaughton commented Apr 27, 2019

Overview

Code extraction for readability

Before

Code less readable

After

Code more readable

Technical Details

Comments

This is for readability but I also want to add an api that retrieves conflicts without
trying a merge for more control & this will help with that

@civibot
Copy link

civibot bot commented Apr 27, 2019

(Standard links)

@civibot civibot bot added the master label Apr 27, 2019
@seamuslee001
Copy link
Contributor

@eileenmcnaughton this needs a rebase now

This is for readability but I also want to add an api that retrieves conflicts without
trying a merge for more control
@eileenmcnaughton
Copy link
Contributor Author

@seamuslee001 done also doing this one right now ... #14144

@seamuslee001
Copy link
Contributor

this looks like a nice clean extraction, we have plenty of dedupe tests which should tell us if there is something wrong, adding merge on pass

@eileenmcnaughton eileenmcnaughton merged commit 07d7847 into civicrm:master Apr 28, 2019
@eileenmcnaughton eileenmcnaughton deleted the dedupe8 branch April 28, 2019 22:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants