On Fri, Jul 20, 2007 at 01:27:08AM +1000, Stephen Rothwell wrote: > 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.
I was in the master branch of powerpc.git and did a 'git-pull' Mark _______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@ozlabs.org https://ozlabs.org/mailman/listinfo/linuxppc-dev
