Could I use Revert after abrupting Merge?

Posted by John on Stack Overflow See other posts from Stack Overflow or by John
Published on 2010-05-28T13:49:25Z Indexed on 2010/05/28 13:51 UTC
Read the original article Hit count: 216

Filed under:

Hallo all,

Just now I tried to upload a modified working copy to its branch in the following steps: 1. Update 2. Commit Then I attempted to Merge the changes in the trunk to this branch. However during editing of the conflicts I realized there were so many conflicting codes that I could not address completely today, then I gived up the Merge, and the working copy got an exclamation mark immediately. Thru Check for modifications I found that many many files had been modified or had conflicts. It seems that the Merge has been somehow wrongly carried out. My question: could I return to the state before the Merge simply using Revert?

Thanks a lot in advance,

John

© Stack Overflow or respective owner

Related posts about tortoisesvn