Mikayil Abdullayev

创建于 2021年01月13日 12:30

Oh yes, if I click that everything sets up correctly. I just wanted to make clear the difference between the two windows. Thanks a lot

1. 社区
2. IntelliJ IDEA Users
3. IJ Idea merge conflict resolution window and the conflicts in plain text differ

• 0 票

创建于 2021年01月03日 11:21

Thank you, Dima, a lot. I wouldn't imagine that would be such a simple logic. Now it's all set.

1. 社区
2. IntelliJ IDEA Users
3. How does the Resolve simple conflicts work in Intellij IDEA

• 0 票

创建于 2021年01月03日 07:44

Thanks, Kostya for the quick reply. But could you please give more explanation for the following excerpt that I took from the link you provided:  "if the beginning and the end of the same line have...

1. 社区
2. IntelliJ IDEA Users
3. How does the Resolve simple conflicts work in Intellij IDEA

• 0 票