-
Committer:
Sean Whitton
-
Date:
2019-02-15 22:31:54 UTC
-
mfrom:
(1099.1.1)
-
Revision ID:
git-v1:93d2c36d08ee95e7eaebc92bd0557569981b95cf
Pseudomerge branch 'master' over 'next'
Mistakenly, the 'next' branch diverged from 'master'. This merge
commit nullifies the divergent commit so that 'next' be fast-forwarded
to 'master', like this:
% git checkout master
% git merge -s ours next
% git checkout next
% git merge --ff-only master