steveloughran commented on issue #1899: URL: https://github.com/apache/hadoop/pull/1899#issuecomment-618374352
Hi> Sorry for the force push, I had done the -amend and rebased it afterwards. So, wasn't able to go back to the previous HEAD to have the commit and unstage changes. why the -amend? Why not just add another cvhange. Please don't rebase once reviewing has started, as it becomes impossible to tie discussions back to the state of the patch at the time, or see what changes happened after. For example, a commit called "fix review changes" Which review? I can't see from the history any more Until other people start reviewing -go for it. Once it's begun, if you do need to reset everything it is better to start again with a whole new PR with the single history squashed ``` git diff trunk...HEAD > history.diff git co trunk git co -b new-branch git apply -3 --verbose --whitespace=fix history.diff ..etc. etc ``` Key point; rebasing makes reviewing significantly harder, the harder a patch is to review, the fewer reviews it gets. ---------------------------------------------------------------- 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: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: common-issues-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-issues-h...@hadoop.apache.org