Merge conflicts tool - question

Can someone explain how to use the right-hand pane of the 3-pane merge tool?

When a file needs merging or merges with conflicts, I'd expect to see the file with my changes and the file with the conflicting repository changes (i.e. the latest repository version) displayed either side of the 'merged result' output file. This way I can see and compare my changes with the conflicting repository changes and decide how to resolve the conflicts.

As it is, the right-hand pane (captioned 'Changes from Server') shows the original version of the file I checked out (i.e. before either of the sets of conflicting changes was made). I've never been able to figure out quite how to use this original version when resolving the conflicting changes.

So how's it done?

3 comments

It should be the way that you describe / expect it to be.

as also stated in the help of IDEA 7 (resolving conflicts page):

The left pane shows the read-only local copy; the right pane shows the read-only version checked in to the repository. The central pane shows a fully-functional editor with the results merge and conflict resolving. Initially, the contents of this pane is the same as the local copy.

I don't know which VCS you're using, but the integration plugin might contain a bug ?

0

It should be the way that you describe / expect it to
be.

But it isn't - and hasn't been as long as I remember.

The central pane shows a
fully-functional editor with the results merge and
conflict resolving. Initially, the contents of this
pane is the same as the local copy.


Unless the merge has already been done automatically (merged with conflicts), in which case it shows the merged result.

I don't know which VCS you're using, but the
integration plugin might contain a bug ?


I'm using CVS. It may have a bug, that's why I'm asking the question, but since I haven't seen anyone else mention it, I've assumed that they don't have a problem with it, and so I'm wondering how they use it.

0

OK, since no-one has felt able to answer my question, I shall now assume that it is a bug and raise a JIRA for it - It looks pretty simple to fix, although if it's been broken this long without any complaints, I don't hold out much hope...

Created http://www.jetbrains.net/jira/browse/IDEA-16437

0

Please sign in to leave a comment.