FINERACT-1029 Failing lint test for static#1021
Merged
xurror merged 1 commit intoapache:developfrom Jun 15, 2020
nnatarajan:NN_FINERACT-1029
Merged
FINERACT-1029 Failing lint test for static#1021xurror merged 1 commit intoapache:developfrom nnatarajan:NN_FINERACT-1029
xurror merged 1 commit intoapache:developfrom
nnatarajan:NN_FINERACT-1029
Conversation
Member
|
@nnatarajan would you be willing to resolve the merge conflicts which now appear here? Thanks! (It's just due to us having meanwhile merged other PRs; this sometimes happens when we work in parallel, and is somewhat unavoidable.) |
Contributor
Author
|
How frustrating! Both checks passed on GitHub yesterday, earning xurror ok. I was concerned that this would not get merged in time. It seems with all the bulk changes today have resulted in merge conflicts, which will continue until completed. Please let me know when the bulk changes are complete, then it will make sense to redo the 500 changes on my end. I am hoping that I can revisit and resolve this tomorrow. |
Member
|
Bulk changes for mass reformatting are now fully completed. |
Contributor
Author
|
@vorburger , resolved the merge conflicts. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
@vorburger
From the static lint check, it appears that the variables created are not being used.
It is ok to delete the variables?
Checklist
Please make sure these boxes are checked before submitting your pull request - thanks!
Commit message starts with the issue number from https://issues.apache.org/jira/projects/FINERACT/. Ex: FINERACT-646 Pockets API.
Coding conventions at https://cwiki.apache.org/confluence/display/FINERACT/Coding+Conventions have been followed.
API documentation at fineract-provider/src/main/resources/static/api-docs/apiLive.htm has been updated with details of any API changes.
Integration tests have been created/updated for verifying the changes made.
All Integrations tests are passing with the new commits.
Submission is not a "code dump". (Large changes can be made "in repository" via a branch. Ask on the list.)
Our guidelines for code reviews is at https://cwiki.apache.org/confluence/display/FINERACT/Code+Review+Guide