Johannes Schindelin skrev:
I'd do the merge, but undo it right after that.
Okay that's what I figured, more or less.
Thanks.
-Rune
___
lilypond-devel mailing list
lilypond-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-devel
hI,
On Sun, 11 Nov 2007, Rune Zedeler wrote:
> I am a bit surprised that I found no git-documentation on how to test
> whether it will be possible to merge two branches without actually
> recording the merge.
I'd do the merge, but undo it right after that.
First, make sure that you have a cle
I am a bit surprised that I found no git-documentation on how to test
whether it will be possible to merge two branches without actually
recording the merge.
If I understand the docs correctly, this has to be done like this:
$ git merge --squash ...
$ git reset --mixed HEAD
... (test whether
