Intelligent Merge Conflict Resolution Of Imports

Answered

My workflow for resolving conflicts is:

  • Click the merge button
  • Click "Apply all non-conflicting changes"
  • Add all imports from the left AND right
  • Close the merge and open the file in IDEA
  • Delete the red imports
  • Optimise imports
  • Find any red code and add imports

The last step is necessary for when there isn't a unique import and a choice has to be made.

However, apart from that last step I think IDEA could do all this automatically.

What do you think, could this intelligent merge be added?

 

Please sign in to leave a comment.