(Solved) Undo "Accept Yours"
Answered
I'm working in a quite large merge and I've hit by error the "Accept Yours". Undoing (Ctrl + Z) does not undo this and I don't know what file was selected when the button was pressed so I can't check it directly either. Any ideas? I'd rather not start the whole merge all over.
Never mind, there's a "Console" tab on Version Control where the file was listed so I managed to do its merge manually.
Please sign in to leave a comment.
(moved content to the topic)
This feature is definitely needed. I accidentally did "Accept Yours". There should at the very least be a confirmation dialog! The fact that you can't undo Accept Yours / Accept Theirs is very disappointing.
Vote for https://youtrack.jetbrains.com/issue/IDEA-158349