Wondering if <https://youtrack.jetbrains.com/issue...

# intellij

[wasyl]

Wondering if https://youtrack.jetbrains.com/issue/IDEA-86700/Diff-view-should-prefer-addition-of-complete-code-blocks will ever get some traction. What’s particularly jarring is that git diff in terminal shows much more useful diff than IJ, even though it’s much easier to revert chunks in IJ 😕 Is there an option to use the diff generated by local git installation?

[christophsturm]

“not kotlin”, but voted on the ticket anyway. on the topic of diffs: I really don’t understand the merge view. I do all my merges manually by scrolling through the file and removing the conflict markers.

[wasyl]

ah right, forgot this is Kotlin slack and not Jetbrains Slack, sorry 😬 I wanted to open a new issue to remind someone but figured posting here might be a better idea

[wasyl]

I do all my merges manually by scrolling through the file and removing the conflict markers.

Same here, but I think I just don’t grok how merging tools in general should be used. Seems much faster to e.g. remove all the conflict markers from imports and let IJ sort them out itself

[christophsturm]

right. its totally possible that I just don’t understand how the merge ui is supposed to be used.

[christophsturm]

one thing I do know: a dedicated tool like kaleidoscope.app show much nicer diffs than idea (or github)

[Marit van Dijk]

Also "not Kotlin" but I did do a video on

Resolving Merge Conflicts in IntelliJ IDEA▾

if that helps?

[christophsturm]

“Not kotlin” but I’m going to watch it now.

[christophsturm]

cool, I will definately try out the merge conflict ui next time I have a merge conflict. One question: what is the difference between “Accept Left/Right Side” and “Resolve using Left/Right”?

[Marit van Dijk]

"Accept Left/Right Side” accepts the changes from selected side, but leaves any changes from the other side. “Resolve using Left/Right” accepts the changes from selected side and ignores the changes from the other side.

[Marit van Dijk]

So if you know you want to accept one side & ignore the other, "resolve" is faster (one step instead of 2)

[christophsturm]

makes sense!