Eh, yet another one, sorry:
On 14/07/2017 01:32, Igor Djordjevic wrote:
>
> $ git checkout featureA
> $ git commit
> $ git checkout master
> $ git reset --hard HEAD^
> $ git merge <HEAD@{1} parents>
The last line should stress <HEAD@{1} *parent branches*>, as we`re
not merging exact parent commits the previous merge commit was made
of, but updated tips of the branches the previous merge commit was
made of... or something along those lines :)
