wanghongqi commented on issue #4185: URL: https://github.com/apache/nifi/pull/4185#issuecomment-618462303
> No it's not, at the top of the pull request you can see that it contains 13 commits, modified 73 files, adds 2046 lines of code and removes 490 lines of code which is much more than your changes alone. > > Rebasing and squashing really depends on how you have your local git configured but usually I do it this way: > `git merge-base <branch name> <master>` (example `git merge-base NIFI-7313 apache/master`) > this returns a `<commit ID>` > `git rebase -i <commit ID>` > it'll open a list of commits, I'd delete the ones that are not related to your work, and squash the additional commits you added (and only keep untouched the first one in the list) > then `git push -f` > to force push the changes here. > > At the end, the pull request here should only show 1 commit. A ha.Thanks very muth.I squash is.It's only 1 commit! ---------------------------------------------------------------- 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. For queries about this service, please contact Infrastructure at: [email protected]
