[Gnu-arch-users] Re: undo tla star-merge ??

[Zenaan Harkness]

On Fri, 2004-10-22 at 16:03, Zenaan Harkness wrote:
> OK I have my archive, and my working tree, and my stable/pivot/merging
> tree.
> 
> I made some changes in my working tree.
> 
> I ran tla star-merge --three way from the stable tree, to grab some
> changes from my coworker.
> 
> Then I realised that what I really wanted to do was a pure merge.
> 
> So I should have done:
> 
> tla undo
> tla star-merge
> tla commit ...
> 
> and then tla redo and then continue working.
> 
> So, can I undo the tla star-merge, to get back to my
> "working tree + changes - star-merge stuff"?

And my local tree has an additional commit against it at this point,
courtesy a separate working tree.

tia
zen