Do we need to reset the master branch?
Mark A. Greer
mgreer at mvista.com
Fri Jul 20 01:32:17 EST 2007
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" <mgreer at mvista.com> 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'
More information about the Linuxppc-dev