Thread (1 message) 1 message, 1 author, 2016-06-15

Re: Merging tags does not fast-forward with git 1.7.9

From: Andreas Schwab <hidden>
Date: 2016-06-15 22:53:01

Domenico Andreoli [off-list ref] writes:
This is Debian unstable, out-of-the-box git package 1.7.9-1.

$ git reset --hard v3.3-rc2
HEAD is now at 62aa2b5 Linux 3.3-rc2
$ git merge --ff-only v3.3-rc3
fatal: Not possible to fast-forward, aborting.
$ 
Workaround:

$ git merge v3.3-rc3^{}
Updating 62aa2b5..d65b4e9
Fast-forward

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help