Github user joewitt commented on the issue:
https://github.com/apache/nifi/pull/1323
I'm hardly a git guru but what we'd like to end up with is your commits
after the current point on master. So first you need to pull latest master.
Let's say 'origin' is pointing at the canonical apache nifi repository.
git fetch --all
git rebase origin/master
After this you should end up with your commits after all the other already
merged commits. Then you can do 'rebase -i HEAD~5' (assuming there are 5 of
your commits at the end). You can mark the last 4 commits in the list as 's'
which will squash them with the first commit in the list resulting in a single
commit.
Hopefully that helps.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
