XYUU edited a comment on pull request #527: URL: https://github.com/apache/guacamole-client/pull/527#issuecomment-719445637
> You can definitely combine them. The easiest way in my opinion is to use git's interactive rebase feature and use the "fixup" operation to meld one commit into another. > > You could also simply do a `git reset --soft HEAD~1` to effectively roll things back to just before the latest commit (`HEAD` is the latest commit and `HEAD~1` is that commit's parent) and then `git commit --amend` to add those changes to the most recent commit. > > If you're worried about accidentally wiping out your changes: > > * You can always make a backup branch to ensure you can go back to where you were. > * You can always reset things to the state of the pull request (the state of `master` in your fork) > * You can verify that things match before doing a force push by doing a `git diff` against the remote. The changes should be identical, even though there is one commit instead of two.  Do you think this is appropriate? ---------------------------------------------------------------- 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]
