matplotlib-devel Mailing List for matplotlib

On Wed, Dec 7, 2011 at 8:56 AM, Michael Droettboom <md...@st...> wrote:
> On 12/06/2011 10:10 PM, Benjamin Root wrote:
>
>
>
> On Tuesday, December 6, 2011, Michael Droettboom <md...@st...> wrote:
> > Yesterday I managed to accidentally move the v1.1.x branch pointer to
> > point to master. I have since moved it back, but you may need to rebase
> > if you have any active branches based on the (wrong) v1.1.x branch. The
> > following should suffice:
> >
> > git fetch upstream
> > git rebase upstream/v1.1.x
> >
> > Mike
> >
>
> I am getting a whole bunch of conflict errors. I wonder if it is because
> I rebased already when v1.1.x was pointed to master? Are we sure that
> v1.1.x is ok? If so, I could just delete my copy and refetch it from
> upstream?
>
> It's quite possible to get conflict errors if you rebased on v1.1.x when
> it was the same as master and are now going back. I'm really sorry for the
> inconvenience this mistake caused.
>
> But it should be possible to reapply your new commits on top of v1.1.x
> without too much trouble. Feel free to contact me off list and maybe we
> can get to the bottom of what's going on for you.
>
> Cheers,
> Mike
>
As a note, it appears that doing "git rebase upstream/v1.1.x -s ours"
produces the correct result. Although, I think it might have set my push
remote to point to the matplotlib repo and not my own github repo, but I
might be wrong on that.
Ben Root

On 12/06/2011 10:10 PM, Benjamin Root wrote:
>
>
> On Tuesday, December 6, 2011, Michael Droettboom <md...@st... 
> <mailto:md...@st...>> wrote:
> > Yesterday I managed to accidentally move the v1.1.x branch pointer to
> > point to master. I have since moved it back, but you may need to rebase
> > if you have any active branches based on the (wrong) v1.1.x branch. The
> > following should suffice:
> >
> > git fetch upstream
> > git rebase upstream/v1.1.x
> >
> > Mike
> >
>
> I am getting a whole bunch of conflict errors. I wonder if it is 
> because I rebased already when v1.1.x was pointed to master? Are we 
> sure that v1.1.x is ok? If so, I could just delete my copy and 
> refetch it from upstream?
It's quite possible to get conflict errors if you rebased on v1.1.x when 
it was the same as master and are now going back. I'm really sorry for 
the inconvenience this mistake caused.
But it should be possible to reapply your new commits on top of v1.1.x 
without too much trouble. Feel free to contact me off list and maybe we 
can get to the bottom of what's going on for you.
Cheers,
Mike

On Tuesday, December 6, 2011, Michael Droettboom <md...@st...> wrote:
> Yesterday I managed to accidentally move the v1.1.x branch pointer to
> point to master. I have since moved it back, but you may need to rebase
> if you have any active branches based on the (wrong) v1.1.x branch. The
> following should suffice:
>
> git fetch upstream
> git rebase upstream/v1.1.x
>
> Mike
>
I am getting a whole bunch of conflict errors. I wonder if it is because I
rebased already when v1.1.x was pointed to master? Are we sure that v1.1.x
is ok? If so, I could just delete my copy and refetch it from upstream?
Ben Root