Resolve conflicts window wrong label
已回答
Hi,
I think that the window "Resolve conflicts..." -> "Merge..." has wrong labels. I mean, the left one "Your version" actually contains server changes and the right label named "Server version" actually are the local changes.
Thanks.
请先登录再写评论。
Appears to be correct on my side.
How exactly do you get the conflict? Does it appear during rebase?
Maybe i'm thinking it wrong.
I will explain the situation, when I make changes in my local branch and then I do a 'git pull' and got conflicts I go to VCS -> Git -> Resolve conflicts... and I select any class and put "Merge...".
I'm seeing the window divided in 3. "Your version (Read-only)", "Result" and "Changes from server (Read-only)".
Below the "Your version (Read-only)" i'm seeing changes that came from the remote branch. And below "Changes from server..." I'm seeing changes that I made locally. Seems to be switched.
It is clear what you mean, but does not happen to me. Tried running git pull from IDE and externally, with rebase and merge - in all cases panels are marked correctly.
Check if the same happens in the latest EAP and submit a request with logs and screenshots to the tracker if it happens there.
Seems not an issue for me anymore with https://youtrack.jetbrains.com/issue/IDEA-136155 is a lot more clear.
Thx.