Explain these Merge Review windows

Answered

I'm a long long time user of IntelliJ and throughout all of these years I always find myself struggling to understand what the heck I'm looking at with regards to the 3 panel Merge Revision when dealing with a conflict.

Here is the situation for the branch.

I have a Branch B which I started 2 months ago but got sidelined.

What I did was

  • update develop with a git pull
  • switched to Branch B
  • trying to update branch B with rebase develop

This gives me the state of being in conflict which is fine I can work it out but I need to know what panel is what.

This is what I never seem to get because it always seems to be on different sides when comparing files in a project and in other projects.

With regard to the Left side 'Your version'

  • Is this the Branch B
  • Is this the Branch develop

With regard to the Right side 'Changes from the server'

  • Is this the Branch B
  • Is this the Branch develop

At times it seems that the server is actually my files and not that of the develop branch.

Other times it seems to be the other way around.

 

Is Your Version always to be the Branch you are currently on?

If I am on Branch B and I rebase from Develop then Develop would be my 'Your Version' as it takes place on the branch then my code gets put on top of it which then makes 'Changes from the server' my Branch B.

I'm just confused over this and need some guidance.

0
3 comments

Hello edjm

Indeed, this can be confusing

In case of rebase - on a left side you have changes from server, since git checks out remote branch that leads you to detached HEAD state and then it starts to apply changes from your local branch above a remote branch, therefore in "Changes from server" you will have a version of a file from your local branch. We will work on making this process more clear.

1

Ruslan Kuleshov any updates on this? The naming is still as confusing as before.

1

A Fedulov 
We have a similar issue reported for merge conflict on unstashing changes: https://youtrack.jetbrains.com/issue/IJPL-80795.
While it is not during rebasing, the symptoms are the same - left/right pane title is confusing. Therefore, the fix for this issue should help improve the behavior when merge conflict occurs on rebase, also. Feel free to vote for it and follow for progress updates.
Sorry for the inconvenience.

2

Please sign in to leave a comment.