Github user DaanHoogland commented on the pull request:
https://github.com/apache/cloudstack/pull/700#issuecomment-131872061
@rafaelweingartner if you git rebase -i HEAD~2 and have $EDITOR set to
something usable you will get and editor with instructions something like:
```
pick fa7f8cf @rafaelweingartner Had a problem while squashing
@cristofolini commits, for some odd reason
pick 3937e7b removed trailing whitespace
# Rebase #######..######## onto ####### ( 2 TODO item(s))
#
# Commands:
# p, pick = use commit
# r, reword = use commit, but edit the commit message
# e, edit = use commit, but stop for amending
# s, squash = use commit, but meld into previous commit
# f, fixup = like "squash", but discard this commit's log message
# x, exec = run command (the rest of the line) using shell
#
# These lines can be re-ordered; they are executed from top to bottom.
#
# If you remove a line here THAT COMMIT WILL BE LOST.
#
# However, if you remove everything, the rebase will be aborted.
#
# Note that empty commits are commented out
```
On the second line replace pick with f or s. if you choose s you get the
change to change the commit message, which in this case I would change to
"Removed duplicate code in CitrixResourceBase and subclasses". If you do use s
a second editor will come.
---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
