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.
On 12/06/2011 10:10 PM, Benjamin Root wrote:
On Tuesday, December 6, 2011, Michael Droettboom <mdroe@...31... > > wrote:
> Yesterday I managed to accidentally move the v1.1.x branch
> 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
> following should suffice:
> git fetch upstream
> git rebase upstream/v1.1.x
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?