libtool-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Rebase of the pr-msvc-support branch?


From: Ben Pfaff
Subject: Re: Rebase of the pr-msvc-support branch?
Date: Thu, 08 Jan 2009 21:19:22 -0800
User-agent: Gnus/5.11 (Gnus v5.11) Emacs/22.2 (gnu/linux)

Peter Rosin <address@hidden> writes:

> Should I kill the branch on savannah, rebase my local tree and finally
> push a brand new pr-msvc-support branch? Should I create a new topic
> branch named pr-msvc-support2? Should I merge git-head into the branch?
> That sure feels backwards, but what do I know? Please help.

As a practical matter, I've found that Git at Savannah is
configured to prevent updating a branch other than through a
"fast forward", even if you use the "+" syntax on git-push.  That
means that pushing a rebased version of a branch won't work.

If the libtool Git is set up that way, you can work around the
problem by first deleting the branch, then creating a new branch
with the same name as the old one with the rebased content, e.g.
     git push origin :pr-msvc-support           # Delete branch.
     git push origin HEAD:pr-msvc-support       # Recreate branch.
-- 
Ben Pfaff 
http://benpfaff.org





reply via email to

[Prev in Thread] Current Thread [Next in Thread]