|
|
TypeScript |
1454 |
Merge Tailwind CSS classes without style conflicts |
Apr 28, 2023 |
|
|
None |
2 |
Merge Tailwind CSS classes without style conflicts |
Jun 12, 2023 |
|
|
Ruby |
11 |
Utility function to efficiently merge Tailwind CSS classes without style conflicts. |
Mar 10, 2023 |
|
|
JavaScript |
2 |
diff 3 conflicts — solve merge conflicts fast |
Apr 12, 2023 |
|
|
CoffeeScript |
437 |
Resolve git merge conflicts in Atom |
Aug 28, 2022 |
|
|
Lua |
2 |
Settle your merge conflicts from Neovim |
Nov 12, 2022 |
|
|
Haskell |
8 |
Safely synchronise values with safe merge conflicts. |
Jun 20, 2022 |
|
|
JavaScript |
2 |
Simple merge utility to extend objects without extra dependencies |
May 15, 2022 |
|
|
CSS |
2 |
Use Bootstrap without any conflicts. |
Jul 29, 2022 |
|
|
Shell |
6 |
Squash commits without repetitive conflicts |
Jul 26, 2017 |
|
|
C# |
2 |
Utility for bisecting RTC conflicts |
Sep 09, 2021 |
|
|
Kotlin |
217 |
A Gradle Plugin for resolving AndroidManifest.xml merge conflicts. |
Dec 12, 2022 |
|
|
Java |
2 |
GUI Tool for processing git pre merge and print merge conflicts to terminal |
Aug 02, 2019 |
|
|
Python |
119 |
Detect source code merge conflicts in realtime. Simply get rid of merge hells. |
Jun 12, 2022 |
|
|
TypeScript |
4 |
GitHub Action to automatically label PRs with merge conflicts |
Jul 26, 2022 |
|
|
JavaScript |
66 |
merge() utility function |
Dec 10, 2021 |
|
|
Scala |
22 |
Find classes and resources conflicts in your build |
Sep 19, 2021 |
|
|
Lua |
232 |
A plugin to visualise and resolve merge conflicts in neovim |
Aug 14, 2022 |
|
|
JavaScript |
264 |
git merge driver for resolving conflicts in npm-related files |
Aug 11, 2022 |
|
|
JavaScript |
4 |
Utility to automatically resolve composer.lock git conflicts |
Feb 12, 2022 |
|
|
Pascal |
3 |
ILMerge without the "merge". |
Nov 20, 2017 |
|
|
Python |
23 |
Simple Omitter of Conflicts Kit - tool that prevents some of merge conflicts in .pbxproj … |
Mar 03, 2020 |
|
|
JavaScript |
6 |
A basic changelog manager made to avoid conflicts at git merge |
Nov 02, 2022 |
|
|
Shell |
17 |
A tool to keep a changelog without conflicts |
Jul 13, 2021 |
|
|
Lua |
4 |
Easily resolve git conflicts without leaving Neovim's buffers |
Dec 28, 2021 |
|
|
JavaScript |
5 |
Conditionally merge JS style objects |
Mar 08, 2023 |
|
|
JavaScript |
5 |
A small utility for quickly generating BEM-style naming for CSS classes. |
Oct 03, 2018 |
|
|
Go |
2123 |
Git workflow automation to keep branches in sync and reduce merge conflicts. |
Apr 19, 2023 |
|
|
HTML |
2 |
Template repo for Learning Lab course "Managing merge conflicts". Course repo ➡️ |
May 13, 2022 |
|
|
JavaScript |
25 |
Parse a JSON string that has git merge conflicts, resolving if possible |
Apr 24, 2022 |
|
|
TypeScript |
26 |
GitHub action that adds a label once a PR has merge conflicts |
Mar 08, 2023 |
|
|
None |
2 |
Course repo for Learning Lab course "Managing merge conflicts". Template repo ➡ |
Feb 12, 2024 |
|
|
TypeScript |
2 |
Merge objects without structure changes |
Mar 05, 2023 |
|
|
Python |
16 |
Merge dicts without mutating them. |
Dec 13, 2018 |
|
|
Java |
11 |
core utility classes |
Aug 01, 2021 |
|
|
JavaScript |
12 |
Functional utility classes |
Apr 14, 2023 |
|
|
CSS |
2 |
CSS Utility Classes |
Jul 30, 2019 |
|
|
C# |
2 |
C# Utility classes |
Jun 30, 2022 |
|
|
Java |
4 |
Android Utility classes |
Mar 30, 2018 |
|
|
PHP |
2 |
WordPress utility classes. |
Jul 24, 2016 |
|
|
Java |
20 |
jetbrick utility classes |
May 06, 2023 |
|
|
JavaScript |
303 |
CSS utility classes |
Feb 03, 2023 |
|
|
PHP |
7 |
PHP utility classes |
Apr 16, 2019 |
|
|
Python |
5 |
🦜bitbucket merge poll utility |
Jul 22, 2020 |
|
|
C# |
4 |
Merge multiple classes into one using SourceGenerators |
Mar 20, 2023 |
|
|
JavaScript |
6 |
A simple mail-merge style solution |
May 18, 2018 |
|
|
Python |
16 |
Merge two directories without losing files |
May 04, 2023 |
|
|
Python |
4402 |
Python Classes Without Boilerplate |
Aug 29, 2022 |
|
|
Shell |
3 |
Command-line utility to remove conflicts from CouchDB/Cloudant documents |
Mar 15, 2021 |
|
|
TypeScript |
407 |
React utility to merge refs 🖇 |
Oct 05, 2022 |