On 2007-10-18 17:26:48 +0530, Rajkumar S wrote:
> git --bare fetch ../stg_branch my_branch02:my_branch02
> my_branch02:my_branch02 my_branch01:my_branch01 master:master
[...]
> It says
> * refs/heads/my_branch02: not updating to non-fast forward branch
> 'my_branch02' of ../stg_branch
>
> my_branch02 is the StGit managed branch from stg_branch, other
> normal branchs are getting merged. Since this is StGit managed, fast
> forward merge is not possible, I guess. So how can I pull in the
> StGit managed changes to web.git repository?
Either prefix each of the refspects with a + (as in
+my_branch01:my_branch01), or use the -f flag (which has the same
effect as using + on all the refspecs). This will allow the refs to be
overwritten even if it's not a fast-forward.
You have to do this with StGit-managed branches, since StGit is
essentially just a convenient way to rebase commits.
--
Karl Hasselström, kha@xxxxxxxxxxx
www.treskal.com/kalle
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
