Do we need to reset the master branch?

Do we need to reset the master branch?

[Mark A. Greer]

Hi Paul,

I did a git-pull this morning but it had a conflict.  Should I have
reset it to something?

Thanks,

Mark

Re: Do we need to reset the master branch?

[Stephen Rothwell]

Hi Mark,

On Thu, 19 Jul 2007 08:17:46 -0700 "Mark A. Greer" <mgreer@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.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

Re: Do we need to reset the master branch?

[Mark A. Greer]

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

Mark

Re: Do we need to reset the master branch?

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 814 bytes --]

On Thu, 19 Jul 2007 08:32:17 -0700 "Mark A. Greer" <mgreer@mvista.com> wrote:
>
> I was in the master branch of powerpc.git and did a 'git-pull'

Sorry, I hadn't updated since this afternoon.  Looks like Paul has reset
his master tree to be the same as Linus', so you do need to do a reset.
Or checkout a separate branch and use

git fetch -f <powerpc.git tree> master:<whatever branch tracks master>

Using recent git (after 1.5.something), you can track the whole powerpc
tree like this:

git remote add powerpc git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git
git fetch powerpc

This will track the tree in branches called powerpc/<branch> and do
resets as necessary.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

Re: Do we need to reset the master branch?

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 485 bytes --]

On Fri, 20 Jul 2007 01:44:32 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> git remote add powerpc git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git
> git fetch powerpc
> 
> This will track the tree in branches called powerpc/<branch> and do
> resets as necessary.

You should not make any local commits to the powerpc/* branches, of course.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

Re: Do we need to reset the master branch?

[Mark A. Greer]

On Fri, Jul 20, 2007 at 01:46:18AM +1000, Stephen Rothwell wrote:
> On Fri, 20 Jul 2007 01:44:32 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > git remote add powerpc git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git
> > git fetch powerpc
> > 
> > This will track the tree in branches called powerpc/<branch> and do
> > resets as necessary.
> 
> You should not make any local commits to the powerpc/* branches, of course.

Right.

Re: Do we need to reset the master branch?

[Mark A. Greer]

On Fri, Jul 20, 2007 at 01:44:32AM +1000, Stephen Rothwell wrote:
> On Thu, 19 Jul 2007 08:32:17 -0700 "Mark A. Greer" <mgreer@mvista.com> wrote:
> >
> > I was in the master branch of powerpc.git and did a 'git-pull'
> 
> Sorry, I hadn't updated since this afternoon.  Looks like Paul has reset
> his master tree to be the same as Linus', so you do need to do a reset.
> Or checkout a separate branch and use
> 
> git fetch -f <powerpc.git tree> master:<whatever branch tracks master>
> 
> Using recent git (after 1.5.something), you can track the whole powerpc
> tree like this:
> 
> git remote add powerpc git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git
> git fetch powerpc
> 
> This will track the tree in branches called powerpc/<branch> and do
> resets as necessary.

Oh, that's cool  Thanks Stephen.

Mark