-
Notifications
You must be signed in to change notification settings - Fork 426
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
AC-608: rename data source to repositories #589
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Gelassen Thanks for the PR, it looks good. Just make sure to remove the changes not linked to the issue.
@Gelassen Please fix the merge conflict and I will merge. Since gradle is updated, just remove any changes in |
Codecov Report
@@ Coverage Diff @@
## master #589 +/- ##
=======================================
Coverage 14.38% 14.38%
=======================================
Files 184 184
Lines 8565 8565
Branches 746 746
=======================================
Hits 1232 1232
Misses 7256 7256
Partials 77 77
Continue to review full report at Codecov.
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
#586 Is blocking this PR from being merged. |
@Gelassen Please resolve the merge conflict, then we can merge. Sorry for the delay. |
@Gelassen Any updates? |
@Gelassen You might need to just reset everything to the latest master branch and refactor it again. |
Excuse me for the delay, now it is ready for merge. |
@Gelassen There's still a merge conflict here. Make sure to pull the latest changes from master, then redo your changes (i think it's the best solution since I merged other PRs that might use the APIs). See this solution. |
@Gelassen Ping me when you resume working on this. |
@f4ww4z , the common scenario is pull all changes from master to the forked repository; after that do rebase on master for the current branch and create the PR. Please point out issue or issues in case you see any in this approach |
@Gelassen , my recommended solution is to just
|
Description of what I changed
Just refactoring. See the title.
Blocker for AC-400
#585
Issue I worked on
JIRA Issue: https://issues.openmrs.org/browse/AC-608
Checklist: I completed these to help reviewers :)
My pull request only contains ONE single commit
I have added tests to cover my changes. (If you refactored
existing code that was well tested you do not have to add tests)
All new and existing tests passed.
My pull request is based on the latest changes of the master branch.