Hi Mark, On Thu, 19 Jul 2007 08:17:46 -0700 "Mark A. Greer" <[EMAIL PROTECTED]> wrote: > > I did a git-pull this morning but it had a conflict. Should I have > reset it to something?
What did you pull it into? There were conflicts with Linus' tree in the last merge, so there may be conflicts with master as well. I am sure Paul will pull Linus's tree back into his master branch when he returns which should resolve the conflicts. -- Cheers, Stephen Rothwell [EMAIL PROTECTED] http://www.canb.auug.org.au/~sfr/ _______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@ozlabs.org https://ozlabs.org/mailman/listinfo/linuxppc-dev
