How to replace a commit with the commit from another branch

Question

I have a commit from a branch that was deleted. I'm referring to the selected commit in the picture below. The deleted branch is the yellow one.

As you can see, right under that selected commit, there is an exact duplicate of that commit on the Basic_Gameplay branch (which is the green branch to the left).

I want to get rid of the commit on the no-longer-existing yellow branch and just use the duplicate on the green branch. However, the problem is that the selected yellow commit is referenced in a merge with the blue master branch as you can see in the picture.

Is there a way to get rid of the yellow commit and replace it with the commit from the green Basic_Gameplay branch so that the commit being referenced for the merge with the blue master is the green one, not the yellow one?

Answer 1

You could do the below on the commit referencing the yellow commit and remove the reference. (ensure you have reference to the correct parent commit)

git replace --edit <sha>