github - Git merge in a branch that was previously merged -

github - Git merge in a branch that was previously merged -

i have run situation branch merged master branch @ point , changes branch no longer in master. perchance due mishandling of merge conflicts, @ point in time i'm not sure.

the changes in merged branch needed in master branch, if seek merge branch master git returns message "already up-to-date." since branch merged in. best way forcefulness re-merging of branch master?

i think this'll ya

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

and

git checkout -b wip master git alreadapplied.patches # (do whatever's necessary deal conflicts here) # (rebase wip here if conflict resolution has taken # long plenty wip branch has gotten behind master) git checkout -b master wip git branch -d wip

git github