Resolve Merge Conflicts
Resolve all git merge conflicts, preserving the intended changes from both sides.
Insert label
Fix Conflicts Prompt
Resolve all merge conflicts in the current working tree. For each conflict, understand what both sides intended, pick the right resolution, and explain the choice. Make sure the result compiles and tests pass.
Add this to your Facet Inserts in Crystl for one-click access.
Get Crystl