Conflict Marker Sweeper
Scan your files for leftover Git merge conflict markers to ensure you never commit unresolved conflicts.
How to Use
Paste Your Code: Paste the code you want to check into the input area. You can paste the content of multiple files.
Instant Scan: The tool automatically scans your code for Git conflict markers.
Review Report: Get a clear report of any conflict markers found, including the line number.
Code Input
Conflict Marker Report
Your report will appear here...
Never Commit a Merge Conflict Again
Merge conflicts are a normal part of working with Git, but accidentally committing the conflict markers that Git inserts into your files is a common and often embarrassing mistake. These markers can break your application and cause confusion for your teammates. This tool provides a simple safety net to catch these issues before they make it into your repository.
Common Use Cases
Final Check Before Pushing
Before you push your changes after a complex merge, paste your changed files here to do a final sweep for any leftover markers.
Automated CI/CD Checks
You can integrate a similar check into your CI/CD pipeline to automatically fail builds that contain conflict markers.
Onboarding New Developers
This tool can be a great way to teach new developers about merge conflicts and the importance of removing markers.
Reviewing Pull Requests
If you suspect a pull request might contain unresolved conflicts, you can use this tool to quickly verify it.
Frequently Asked Questions
What are Git conflict markers?
Git conflict markers (e.g., `<<<<<<< HEAD`, `=======`, `>>>>>>> branch-name`) are added to a file by Git when a merge conflict occurs. They show you the different versions of the code from the conflicting branches, and you must manually resolve the differences and remove the markers.
Why would I need to sweep for them?
It's surprisingly easy to accidentally commit leftover conflict markers to your repository after resolving a merge. This can break your code and cause issues for other developers. A conflict marker sweeper helps you find these leftover markers before they cause problems.
How does this tool work?
You can paste your code or the content of multiple files into the text area. The tool then scans the text for the standard Git conflict marker patterns and generates a report of any that it finds, including the line number.
Does this tool resolve the conflicts for me?
No, this tool only detects the presence of conflict markers. It does not help you resolve the conflicts. For help with resolving conflicts, you can use our 'Conflict Resolver Assistant' tool.
Is my code uploaded to a server?
No. All the analysis is done directly in your browser. Your code is never sent to our servers, ensuring your data remains completely private and secure.