[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnu-arch-users] undo tla star-merge ??
From: |
Zenaan Harkness |
Subject: |
[Gnu-arch-users] undo tla star-merge ?? |
Date: |
Fri, 22 Oct 2004 16:03:03 +1000 |
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"?
Thanks in advance
Zenaan
--
Homepage: http://www.soulsound.net/
Please respect the confidentiality of this email as sensibly warranted.
- [Gnu-arch-users] undo tla star-merge ??,
Zenaan Harkness <=