Merge Tailwind CSS classes without style conflicts
Resolve git merge conflicts in Atom
Learn why conflicts happen and how to resolve them.
A plugin to visualise and resolve merge conflicts in neovim
Styles for The Carpentries lessons. No README to avoid merge conflicts with lessons. Demo 👇
git merge driver for resolving conflicts in npm-related files
Recipe scraps for Merge Conflict Carnival activity
Generate various kinds of Git conflicts, including conflicts suitable to interactively test a merge resolution tool. More fun stuff at: https://github.com/cirosantilli/test-git-web-interface
No conflicts for your bin dependencies
Easy-to-use CUI for fixing git conflicts
An overview of how to solve internal Thinkful merge conflicts and use github best practices for the curriculum team or anyone who wants to contribute to Thinkful code.
Merge svgs from a folder
A tool to automatically resolve Git conflicts that occur in Xcode project files
翻译 - 一个自动解决Xcode项目文件中发生的Git冲突的工具
sync pipfile/lockfile to setup.py or check dependency and versioning conflicts
A BOSH template merge tool
