Github user srdo commented on the issue:
https://github.com/apache/storm/pull/2074
@kamleshbhatt You can use soft reset to squash the commits if interactive
rebase is too much of a hassle. It might be in this case, because you have a
merge commit in the history. In the future consider using `git pull --rebase`
when pulling master into your branch, this can make squashing easier later.
Start by copying this branch to a backup `git branch STORM-1290-backup
STORM-1290` just to be safe.
Then switch to STORM-1290 `git checkout STORM-1290` and soft reset back to
the commit on master you branched from. Since your first commit to this branch
is called da1c92c1f1a3c659532ce03d11a3ea376aa16e6c, you want the parent of that
commit (in git syntax this is da1c92c1f1a3c659532ce03d11a3ea376aa16e6c~). So do
`git reset --soft da1c92c1f1a3c659532ce03d11a3ea376aa16e6c~`. This resets git
back to the commit you branched from, without touching the files you have in
your repo.
If you do `git status` now, it should show you all the changed files from
this branch. Just add and commit them as usual with the new commit message you
want for this branch. Optionally verify that the log looks like you expect with
`git log`. When you're done, you can push your changes with `git push --force`.
---
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.
---
