VCS conflict merge 关注
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.
I don't think there ever was such an option.
Here's a 4 years old issue describing the problem
Add your vote and raise your voice, maybe finally this could be addressed!
On 24.05.2011 19:32, elchuppa wrote: