conflicted
Lets you check whether or not two given branches in your project would produce a conflict when attempting a merge or rebase
Found 105 results for conflict
gulp-conflicts
Detects when a (new) vinyl file is different than an existing file on the file system, and either prompts the user for action, skips the file, or calls a function on the file to determine the action to take.
@xmorse/tailwind-merge
Merge Tailwind CSS classes without style conflicts
@liuqiang1357/tailwind-merge
Merge Tailwind CSS classes without style conflicts
git-state-archiver
Collects git conflicted files, saves a report and copies files for future review.