Git Conflict Detector
Git Conflict Detector is a VS Code extension that helps developers identify potential merge conflict risks before they occur.
Features
- Detects files modified in the target branch after your last synchronization.
- Warns developers when a file may be at risk of future merge conflicts.
- Automatically tracks repository-specific sync points.
- Supports Git-based workflows using development, main, or master branches.
- Provides file-level risk awareness while coding.
How It Works
- The extension records the latest synchronized commit from the target branch.
- When a file is opened, it checks whether that file has been modified in the target branch after the sync point.
- If newer changes exist, the extension displays a merge conflict risk warning.
- Otherwise, the file is marked as safe.
Example
Safe:
🟢 Safe
Potential Risk:
🟠 Development Updated
Latest Development Commit Message: Fix validation issue
Author: Rahul Sharma
Suggestion:
- Synchronize with development before continuing work.
- Review the latest changes in this file.
- Coordinate with the author if necessary.
Requirements
- Git repository
- Access to the target branch (development/main/master)
Release Notes
0.0.1
Initial release.
| |
