Subject: Re: git rebase: unexpected conflict

From: Jakub Narebski <[email-masked]>
Date: Sun, 04 Feb 2007 20:33:50 +0100

Michael S. Tsirkin wrote:

> git rebase seems to see conflicts where there shouldn't be any.

Were you on a branch that you wanted to rebase? I had made this error once.
git rebase --onto <newbase> <upstream> <branch> moves <upstream>..<branch>
into <newbase>.

-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git