Re: rxe MW PR for rdma-core

[Jason Gunthorpe <jgg@nvidia.com>]

On Thu, Jun 24, 2021 at 11:59:14PM -0500, Bob Pearson wrote:

> It took a few hours but I finally managed to get rid of the merge
> commits in the rxe MW PR. It's back out there at github. I lost the
> name change Jason had made when I deleted and reforked my repo. I
> remade the update kernel headers commit without the ??. It still
> passes all the screening tests.

You should never have to delete and refork with git.

Force push fixes all mistakes.

The sequence to fix your situation is

1) Starting at the bad branch merge to latest rdma-core
2) Create a new branch on latest rdma-core
3) Use 'git cherry-pick' on each non-merge commit from the
   bad branch
4) Diff the bad/good branch to make sure nothing got missed in the
   merges
5) Reset the bad branch to the new branch's commit ID.
6) Force push the fixed branch to github.

In future use 'git rebase' instead of 'git merge'

Jason