Resolve conflicts - Apply All Non-Conflicting Changes - not shown

Answered
Avatar
Info
Created

Hi,

i have no glue since which Version this has disappeared.

This Picture is not right: https://www.jetbrains.com/help/idea/resolving-conflicts.html#distributed-version-control-systems

The Setting Tools -> Diff & Merge -> Automatically Apply All Non-Conflicting Changes - has no effect that this is shown again.

Where is the magic wizard wand?

 

Andreas

--

IntelliJ IDEA 2021.3.1 (Ultimate Edition)
Build #IU-213.6461.79, built on December 28, 2021
macOS 11.6.2

Votes

0

Share

2 comments
Avatar
Ruslan Kuleshov
Created

Hello

As I can see from your attached screenshot - you have opened Diff window, now 3-way-merge window.
Magic wand and "Apply all non-conflicting changes" available in 3-way-merge

0
Avatar
Info
Created

Hi

yes, i remember it.

Thx.

 

0

Please sign in to leave a comment.