I love all the nifty small (and not so small) improvements in IDEA X a lot!
One area that to me always felt like "almost there" is diff/merge - it's a nice UI, has some great features, but also a couple of issues that sometimes make it awkward.
IMHO now would be a great time to improve the diff/merge feature, too - hey RubyMine, PyCharm, PhpStorm, WebStorm, etc. would also benefit from this...
Here are some issues in Jira I would very much like to see adressed. Please comment/vote on the issue itself:
- Add ability to merge in lines from both left and right in three way merge
This is my number one issue: After accepting a change from the left, the change fom the right is hidden and I have to manually copy the change almost blindly. A real usability issue.
- Order of files in Diff dialog should always be the same as in Commit Changes dialog
Also a usability bug: I have just looked at an list of files only to see the changes in a completely different order.
- Supported merging on conflicts which are not conflicting
Why the heck should it be a conflict if I make exactly the same change as somebody else?
- Diff Window in Ignore Whitespace Mode: Says "No Difference" Even If Threr're Ignored Differences
Another, albeit smaller, usability bug: Simply saying "Differences in whitespace only" instead would help.
- When looking at diffs it should be possible to move a file to a change list (or create a new change list)
Happens to me all the time, because I am a little lazy maintaining change lists and only ever notice that at commit time.
- Diff window should have dedicated are at the bottom showing the currently selected difference
That would make it so much easier to grok changes on long lines.
- Change default next-diff/prev-diff bindings to Alt-Down/Alt-Up
A much more natural keybinding, indeed.
- Commit Diff: Get editable version
Ever wanted to correct/adjust a code change of a previous commit. Currently IDEA makes that too complicated.
- Merge VCS conflicts in "import" statements
The most intelligent IDE on the planet should have a way to detect and handle these common "conflicts" automatically.