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 - 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