Git 替换本地分支并将我的分支重新设置在新分支之上

Question

I am pretty sure the answer to this question may be found on SO, at least in bits and pieces on several different posts. I have a branch that was created of a different branch. I have made some commits in my branch and then the owner of the other branch has force pushed some commits onto my branch. After that happened, I have made a few more commits.

Now I am asked to get his clean version (by which I think he meant to replace my local branch) and then rebase my branch on top of the new branch (his?) so that his commits (the "force-pushed" ones) will go away. By that I think what he wants is to never see his commits in the history of my branch.

What would be the steps to do this? I found a lot of references to

git fetch
git reset --hard @{u}
git rebase -i origin/master

but not sure of the outcome as I don't seem to be able to get rid of his commits. For anyone needing a visual picture of what I am talking about, here it is:

Any suggestions would be greatly appreciated. I am using Git Bash, btw.

TIA, Ed

Edit: as requested, here is the output of the "git log --graph --oneline --all" command (Sorry, I had to cover all the comments as some may contain sensitive info):

Answer 1

One tip, post the output of git log --graph --oneline --all with your HEAD, so we have a better insight on what is going on.

If I understood correctly, you should try the following: (make sure you don't force push something. Use hash codes for arguments on reset )

git reset his-last-commit (to uncommit recent edits after his commits)

git stash (to save them)

git reset --hard your-commit (this deletes his commits)

git stash pop (this applies your recent edits on top)

If this doesn't work, you should try git cherry-pick