Re: [matplotlib-devel] v1.1.x branch was (temporarily) wrong

[Benjamin R. <ben...@ou...>]

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