Accept remaining (left or right) in comparison
When doing a comparison with IntelliJ for merge conflicts, one can not use a quick option to accept all remaining line versions from one side.
Example:
- Presume we have 101 conflicts, one needs to be adapted by hand and 100 can be taken from the right side.
If I correct the one and then click “Accept Right”, my manual changes will be overwritten. The other option is to click accept and ignore 100 times, which is a lot of effort.
So, is there or can you implement an option to accept the remaining conflicts, after manual curation, from one side of the comparison?
Please sign in to leave a comment.