[oe] Monotone issues

[Graeme Gregory]

On Mon, 04 Feb 2008 20:54:35 +1030
Rod Whitby <rod at whitby.id.au> wrote:
> > 2) git 1.4 just threw away your local changes on what git calls a
> > 'merge'
> 
> Different tool, different cheat-sheet to learn.  That's always to be
> expected when changing tools.  Monotone merges are so bad that I
> flatly refuse to even attempt a manual merge, preferring to blow away
> my whole monotone repository and start again rather than try a
> monotone manual merge.
> 
This was a bug with git 1.4, totally denied by git developers, but
magically fixed with git 1.5

At least that was my experience of this, I havent seen it since I
started to use git 1.5 and reports on the net dried off after this
point as well.

G