VCS conflict merge

Avatar
Patrick Flynn
Created

I have a vague memory of doing merges in IntelliJ many years ago where one of the options was 'accept first then second' when dealing with a conflict in a file. I find myself constantly accepting one side and copying and pasting the other side into the merged window.  Does this not exist anymore? I can't seem to find that button anymore.

Votes

0

Share

1 comment
Avatar
ANONYMOUS
Created

I don't think there ever was such an option.
Here's a 4 years old issue describing the problem
http://youtrack.jetbrains.net/issue/IDEA-36811
Add your vote and raise your voice, maybe finally this could be addressed!

On 24.05.2011 19:32, elchuppa wrote:

I have a vague memory of doing merges in IntelliJ many years ago where one of the options was 'accept first then second' when dealing with a conflict in a file. I find myself constantly accepting one side and copying and pasting the other side into the merged window.  Does this not exist anymore? I can't seem to find that button anymore.

>

---
Original message URL: http://devnet.jetbrains.net/message/5304149#5304149


0

Please sign in to leave a comment.