fineract icon indicating copy to clipboard operation
fineract copied to clipboard

FINERACT-2063: Enable processing of current and past standing instructions on loans

Open wkigenyi opened this issue 1 year ago • 2 comments

Description

Describe the changes made and why they were made.

Ignore if these details are present on the associated Apache Fineract JIRA ticket.

Checklist

Please make sure these boxes are checked before submitting your pull request - thanks!

  • [ ] Write the commit message as per https://github.com/apache/fineract/#pull-requests

  • [ ] Acknowledge that we will not review PRs that are not passing the build ("green") - it is your responsibility to get a proposed PR to pass the build, not primarily the project's maintainers.

  • [ ] Create/update unit or integration tests for verifying the changes made.

  • [ ] Follow coding conventions at https://cwiki.apache.org/confluence/display/FINERACT/Coding+Conventions.

  • [ ] Add required Swagger annotation and update API documentation at fineract-provider/src/main/resources/static/legacy-docs/apiLive.htm with details of any API changes

  • [ ] Submission is not a "code dump". (Large changes can be made "in repository" via a branch. Ask on the developer mailing list for guidance, if required.)

FYI our guidelines for code reviews are at https://cwiki.apache.org/confluence/display/FINERACT/Code+Review+Guide.

wkigenyi avatar Mar 22 '24 21:03 wkigenyi

@adamsaghy

wkigenyi avatar Mar 23 '24 03:03 wkigenyi

@wkigenyi Seems your branch is conflicting with the latest develop. Kindly asking you to rebase your branch and update your commits by squashing them after the rebase.

What could be a workaround to avoid creating brand new PRs is the following:

  • Rebase your branch with the latest develop (remote): Example: git rebase origin/develop
  • Squash commits: My favorable way: -> git log, find the commit hash just before the target commits, git reset <commit_hash> --mixed -> This way you wont lose the changes, but the commits are undone, Commit all the changes and now it became just 1 commit and finally git push --force. You need the force hence you were changing the git commit tree. However be careful with --force push, hence it is overriding the remote branch. But if the remote branch is your branch and noone else is working on it, then it is fine.

To avoid multiple commits, you might wanna amend your last commit if you realized something need to be changed again, and git push --force can push the newly amended commit to the remote (see above for the warnings!)

adamsaghy avatar Mar 25 '24 11:03 adamsaghy

This pull request seems to be stale. Are you still planning to work on it? We will automatically close it in 30 days.

github-actions[bot] avatar Apr 25 '24 00:04 github-actions[bot]