PM

创建于 2021年11月26日 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...

1. 社区
2. IntelliJ IDEA Users
3. Please help to understand how git merge works in IDEA.

• 0 票

创建于 2021年11月11日 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...

1. 社区
2. IntelliJ IDEA Users
3. Please help to understand how git merge works in IDEA.

• 0 票

创建于 2021年11月03日 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 ...

1. 社区
2. IntelliJ IDEA Users
3. Please help to understand how git merge works in IDEA.

• 0 票

已编辑于 2021年10月29日 08:31

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:

1. 社区
2. IntelliJ IDEA Users
3. Please help to understand how git merge works in IDEA.

• 0 票

创建于 2021年10月29日 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?

1. 社区
2. IntelliJ IDEA Users
3. Please help to understand how git merge works in IDEA.

• 0 票