[Libreoffice] newish to git: howto recover from bad merge?

[Kevin Hunter]

At 9:16am -0500 Sat, 20 Nov 2010, Wols Lists wrote:
> Firstly, I'm slightly surprised no-one suggested merely reverting
> your patch.

> But I'm guessing all you want to do is get rid of your patch and
> replace it with the "official" one - so just dropping your version
> should do what you want?

This is what I was doing previously, but this workflow is not 
sustainable.  For the time being, yes, but I needed to learn "the right 
way" sooner rather than later.

> The other thing, I noticed it said "not currently on any branch".
> Are you using branches?

Yes, I am.  Takeshi did an excellent job of explaining where that comes 
from, with followups from Kohei and Christian:

At 5:53am -0500 Fri, 19 Nov 2010, Takeshi Abe wrote
At 11:31am -0500 Fri, 19 Nov 2010, Kohei Yoshida wrote
At 7:45pm -0500 Fri, 19 Nov 2010, Christian Lohmaier wrote

Cheers,

Kevin