> Quoting Jakub Narebski <jnareb@xxxxxxxxx>: > Subject: Re: git rebase: unexpected conflict > > 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? Yes: I did not specify the <branch> parameter at all. However note that there were merges since the commit that I wanted to skip. > I had made this error once. > git rebase --onto <newbase> <upstream> <branch> moves <upstream>..<branch> > into <newbase>. I really just did git-rebase --onto $1~1 $1 and the commit I gave 9b3bfe5696aa417d38ce903eb345a03d65743dd2 actually as a parent of the current branch. -- MST - 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