Re: More on "fast foward"

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mar 3, 2009, 17:53 UTC
Message-ID: <alpine.DEB.1.00.0903031851090.6399@intel-tinevez-2-302>
In-Reply-To: <450196A1AAAE4B42A00A8B27A59278E709F0769A@EXCHANGE.trad.tradestation.com>

Hi,

On Tue, 3 Mar 2009, John Dlugosz wrote:

Show 6 quoted lines

> After I merged the release fixes back into the development branch, I was 
> surprised that push complained that it was not fast-forward.  I thought 
> someone must have added something since I looked, but no, my repository 
> matches exactly.  My new dev branch label is the immediate descendant of 
> the old one.  My new node has another ancestor as well, but so what? The 
> same changes, not recorded as a merge, would work without complaint.

I can only assume that something went wrong with the merge. To be absolutely sure that your new tip of the branch is a descendant of the current tip on the remote side, do this:

	$ git show-branch $BRANCH $(git ls-remote $REMOTE $BRANCH)

where $BRANCH and $REMOTE are determined by your push command which should look something like this:

	$ git push $REMOTE $BRANCH

The show-branch command should show you what Git assumes happened on both branches (the local and the remote one) since the branch point.

Ciao, Dscho