Удаление маркеров конфликтов Git
Git Conflict Marker Remover Resolve git merge conflicts quickly without an IDE. Paste code with conflict markers, choose which version to keep for each conflict, and get clean output — ready to commit. How to Use Paste your file containing git conflict markers (>). The tool detects and highlights each conflict. For each one, choose ...
Попробуйте инструмент »