PM

Total activity 7
Last activity November 26, 2021 10:29
Member since October 28, 2021 08:42
Following 0 users
Followed by 0 users
Votes 0
Subscriptions 1

PM commented, November 26, 2021 10:29
I tried this: However, from the 3-panel merge dialog, you can open diff between 2 selected revisions, using the button on the toolbar. Comparing Left and Right will likely show what you want. and...
- 0 votes
PM commented, November 11, 2021 10:05
Thanks for clarification. However I not see described central panel behavior helpful for me. Thing is I would prefer to resolve merge conflict in a way similar to classic git merge. This involves o...
- 0 votes
PM commented, November 03, 2021 13:45
I get what you saying. But I not understand why is it so. When I merge I expect to see code from latest commits of branches I merge, but not from closest common to both branches ancestor. This way ...
- 0 votes
PM commented, October 29, 2021 08:30
But I see same happen when merging file was not removed. The code in a middle not coming from any of two branches. Here from same merge but different file:
- 0 votes
PM commented, October 29, 2021 08:18
I found this class was removed on develop branch few commits ago, so may be you right. The unexpected code in a middle comes from removed file. I would say this is a bug. Is it?
- 0 votes
PM created a post, October 28, 2021 08:42
Answered

Please help to understand how git merge works in IDEA.

I have GIT merge conflict flagged in IDEA, and I merging develop branch into my Rental_Return branch. I see the branches code on left and right and it seems good. Right side is empty as file was no...
1. Community
2. IntelliJ IDEA Users
- 3 followers
- 9 comments
- 1 vote