Question

I have run into a situation where a branch was merged into the master branch at some point previously and the changes from the branch are no longer in master. Possibly this was due to mishandling of merge conflicts, but at this point in time I’m not really sure.

The changes in this previously merged branch are needed in the master branch, but now if I try to merge the branch into master Git returns the message “Already up-to-date.” since this branch was previously merged in. What is the best way to force a re-merging of this branch to master?

Answer 1

I think this’ll do ya

mkdir alreadyapplied.patches
git format-patch -o alreadyapplied.patches master..alreadyapplied

and then

git checkout -b wip master
git am alreadapplied.patches
# (do whatever's necessary to deal with conflicts here)
# (rebase wip here if the conflict resolution has taken
# long enough that the wip branch has gotten behind master)
git checkout -B master wip
git branch -d wip