Resolve Simple Conflicts Automatically
Answered
I am merging 2 git branches that are causing lots of simple conflicts.
All of them are automatically resolved by IDEAs "Resolve simple conflicts" button but there are over 100 files I have to do this for.
Is it possible to automate this?
Please sign in to leave a comment.
opticyclic searches
We don't resolve simple conflicts automatically for multiple files in order to avoid any unreviewed changes.
Git has multiple options for resolving conflicts. You might try using the git command directly.
That said, I also wish this happened. No matter what method I use to resolve conflicts, I ALWAYS do a comparison after to make sure the merge went well. I don't need the forced button-pushing. Perhaps a dialog that says, "Are you super sure? You should do a diff afterwards to check the result."
@Ruslan It would be cool if there would be an option for the Diff & Merge Tool "Automatically resolve simple conflicts" (kinda like the "Automatically apply non-conflicting changes")
Ruslan Kuleshov Please add this feature, I also had a problem where I had to resolve conflicts that were all resolvable with the resolve simple conflict button. It was very unpractical to resolve them one by one.
I am rebasing a branch onto a branch with a lot of changes so I am getting a lot of conflicts.
Almost every one is resolved by IDEAs "Resolve simple conflicts" so I searched to see if there was an option for IDEA to apply that action automatically and continue so my rebase doesn't take ages.
The search brought me back here :(
I felt sure I had opened an issue in Youtrack about this 4 years ago but I can't find anything.
So here is a new one Option To Automatically Apply "Resolve simple conflicts" And Continue Rebase : IDEA-356140 (jetbrains.com)