6913: Merge UI needs "Take Both" action

I found myself having to resolve conflicts from an update today. The new UI is quite reasonable and easy to use, however it is missing something quite vital: When merging a file, I cannot merge BOTH the left and right-side of a particular conflicting change. It would have to provide the option to merge first left then right or visa versa.

9 comments

Hello Gordon,

I found myself having to resolve conflicts from an update today. The
new UI is quite reasonable and easy to use, however it is missing
something quite vital: When merging a file, I cannot merge BOTH the
left and right-side of a particular conflicting change. It would have
to provide the option to merge first left then right or visa versa.


Feel free to vote for http://jetbrains.net/jira/browse/IDEADEV-14280.

--
Dmitry Jemerov
Software Developer
JetBrains, Inc.
http://www.jetbrains.com/
"Develop with Pleasure!"


0

I've just been wishing for this recently. Duly voted!

Cheers,
Colin

0

On the theme of "things that would make me use this feature more often," I wish the three-way merge windows could be maximized. I think it's weird to mark something like http://jetbrains.net/jira/browse/IDEA-11921 "won't fix".

0

Hello Anders,

On the theme of "things that would make me use this feature more
often," I wish the three-way merge windows could be maximized. I
think it's weird to mark something like
http://jetbrains.net/jira/browse/IDEA-11921 "won't fix".


This is resolved as won't fix because, as far as I know, Swing/AWT doesn't
allow to show a maximize button on modal dialogs (something which Windows
allows easily). I'll be happy to reopen if you tell me how this can be done.
:)

--
Dmitry Jemerov
Software Developer
JetBrains, Inc.
http://www.jetbrains.com/
"Develop with Pleasure!"


0

I feel your pain, but I'm not inclined to agree that this is a valid reason to not fix this problem....

Why make it a modal dialog in the first place? If it has to be, why not add a button on the toolbar to maximize the window, at least?

Not the prettiest thing in the world, but if I'm doing a three-way merge, it's highly annoying to not have the window be maximized.

0

Hello Anders,

I feel your pain, but I'm not inclined to agree that this is a valid
reason to not fix this problem....


I'm sure that some amount of hard-core hacking (some native code, for example)
will be able to solve this, but I don't think this is an appropriate place
for applying hard-core hacks.

Why make it a modal dialog in the first place?


If the merge dialog is not modal, it'll be possible to edit the file being
merged in another editor while the merge dialog is open. This will cause
all kinds of things to break.

If it has to be, why not add a button on the toolbar to maximize the window,

at least?

This looks very much ugly to me.

Not the prettiest thing in the world, but if I'm doing a three-way
merge, it's highly annoying to not have the window be maximized.


The window remembers its size. Is it really so annoying to resize it once
so that it will occupy the entire screen? And isn't it sized to full screen
by default? (Maybe not. Haven't actually checked.)

--
Dmitry Jemerov
Software Developer
JetBrains, Inc.
http://www.jetbrains.com/
"Develop with Pleasure!"


0

Why make it a modal dialog in the first place?


If the merge dialog is not modal, it'll be possible
to edit the file being
merged in another editor while the merge dialog is
open. This will cause
all kinds of things to break.


I can already edit the file in another program while doing the three-way merge in IDEA -- you already need to handle that case, presumably by putting up the "file changes on disk and in memory" alert. How is that any different, conceptually, than going behind the back of the three-way merge and editing the file directly in IDEA? In both cases, you need to detect the "external" modification and make me chose which change to keep. How about if I promise to NEVER edit the file in IDEA while doing a three-way merge? ;)

Not the prettiest thing in the world, but if I'm

doing a three-way

merge, it's highly annoying to not have the window

be maximized.

The window remembers its size. Is it really so
annoying to resize it once
so that it will occupy the entire screen? And isn't
it sized to full screen
by default? (Maybe not. Haven't actually checked.)


Yes, it is that annoying: I don't always have the same size screen, depending on whether my laptop is docked or not. Either it comes up partially off the screen or too small, depending on what configuration I was in the last time I used it.

To my recollection, It is not sized to the full screen by default -- if it were to always resize itself to the full screen when it comes up, I'd be quite happy with that, actually, so perhaps that's the right path in this case.

0

AW> In both cases, you need to detect the "external" modification
AW> and make me chose which change to keep.

The problem is that one isn't an "external" modification, it's an "internal"
modification.

Checking that the file hasn't changed after the work is done is very different
from handling concurrent changes to your working data.

But it would sure be nice having a non modal dialog :)


0

Please sign in to leave a comment.