adamsaghy commented on PR #3819: URL: https://github.com/apache/fineract/pull/3819#issuecomment-2017782594
@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 too... -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
