Diff/merge improvements

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:

  1. Add ability to merge in lines from both left and right in three way merge
    http://youtrack.jetbrains.net/issue/IDEA-36811
    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.
  2. Order of files in Diff dialog should always be the same as in Commit Changes dialog
    http://youtrack.jetbrains.net/issue/IDEA-23950
    Also a usability bug: I have just looked at an list of files only to see the changes in a completely different order.
  3. Supported merging on conflicts which are not conflicting
    http://youtrack.jetbrains.net/issue/IDEA-12609
    Why the heck should it be a conflict if I make exactly the same change as somebody else?
  4. Diff Window in Ignore Whitespace Mode: Says "No Difference" Even If Threr're Ignored Differences
    http://youtrack.jetbrains.net/issue/IDEA-22363
    Another, albeit smaller, usability bug: Simply saying "Differences in whitespace only" instead would help.
  5. When looking at diffs it should be possible to move a file to a change list (or create a new change list)
    http://youtrack.jetbrains.net/issue/IDEA-17838
    Happens to me all the time, because I am a little lazy maintaining change lists and only ever notice that at commit time.
  6. Diff window should have dedicated are at the bottom showing the currently selected difference
    http://youtrack.jetbrains.net/issue/IDEA-36387
    That would make it so much easier to grok changes on long lines.
  7. Change default next-diff/prev-diff bindings to Alt-Down/Alt-Up
    http://youtrack.jetbrains.net/issue/IDEA-16393
    A much more natural keybinding, indeed.
  8. Commit Diff: Get editable version
    http://youtrack.jetbrains.net/issue/IDEA-56206
    Ever wanted to correct/adjust a code change of a previous commit. Currently IDEA makes that too complicated.
  9. Merge VCS conflicts in "import" statements
    http://youtrack.jetbrains.net/issue/IDEA-22318
    The most intelligent IDE on the planet should have a way to detect and handle these common "conflicts" automatically.
1 comment
Comment actions Permalink

In the middle of doing a big branch to trunk merge, and a lot of these
would really help... especially that last one!  Anyone who's ever had to
merge a codebase should be voting for that one now.
Thanks for compiling them into one post!
N.

On 17/08/2010 1:00 PM, Stephen Friedrich wrote:

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:

>

1. Add ability to merge in lines from both left and right in three way merge
http://youtrack.jetbrains.net/issue/IDEA-36811
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.
2. Order of files in Diff dialog should always be the same as in Commit Changes dialog
http://youtrack.jetbrains.net/issue/IDEA-23950
Also a usability bug: I have just looked at an list of files only to see the changes in a completely different order.
3. Supported merging on conflicts which are not conflicting
http://youtrack.jetbrains.net/issue/IDEA-12609
Why the heck should it be a conflict if I make exactly the same change as somebody else?
4. Diff Window in Ignore Whitespace Mode: Says "No Difference" Even If Threr're Ignored Differences
http://youtrack.jetbrains.net/issue/IDEA-22363
Another, albeit smaller, usability bug: Simply saying "Differences in whitespace only" instead would help.
5. When looking at diffs it should be possible to move a file to a change list (or create a new change list)
http://youtrack.jetbrains.net/issue/IDEA-17838
Happens to me all the time, because I am a little lazy maintaining change lists and only ever notice that at commit time.
6. Diff window should have dedicated are at the bottom showing the currently selected difference
http://youtrack.jetbrains.net/issue/IDEA-36387
That would make it so much easier to grok changes on long lines.
7. Change default next-diff/prev-diff bindings to Alt-Down/Alt-Up
http://youtrack.jetbrains.net/issue/IDEA-16393
A much more natural keybinding, indeed.
8. Commit Diff: Get editable version
http://youtrack.jetbrains.net/issue/IDEA-56206
Ever wanted to correct/adjust a code change of a previous commit. Currently IDEA makes that too complicated.
9. Merge VCS conflicts in "import" statements
http://youtrack.jetbrains.net/issue/IDEA-22318
The most intelligent IDE on the planet should have a way to detect and handle these common "conflicts" automatically.

>

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


0

Please sign in to leave a comment.