JSPM

Found 98 results for conflict

tailwind-merge

Merge Tailwind CSS classes without style conflicts

  • v3.3.1
  • 107.66
  • Published

merge-drivers

Merge Drivers CLI: A command-line interface to conveniently manage custom git merge drivers

  • v1.0.4
  • 64.81
  • Published

npm-merge-driver

git merge driver for automatically merging lockfiles

  • v2.3.6
  • 63.27
  • Published

is-name-taken

Check if an NPM package name is taken

  • v2.0.0
  • 60.82
  • Published

git-diff-apply

Use an unrelated remote repository to apply a git diff

  • v7.0.2
  • 60.62
  • Published

@syncedstore/core

SyncedStore is an easy-to-use library for building collaborative applications that sync automatically. It's built on top of Yjs, a proven, high performance CRDT implementation.

  • v0.6.0
  • 60.59
  • Published

@rushstack/lockfile-explorer

Rush Lockfile Explorer: The UI for solving version conflicts quickly in a large monorepo

  • v1.7.40
  • 58.36
  • Published

@syncedstore/react

React hook useSyncedStore for SyncedStore.

    • v0.6.0
    • 56.55
    • Published

    tw-merge

    Merge CSS utility classes without style conflicts - small and zero config

    • v0.0.1-alpha.3
    • 56.42
    • Published

    base-fs-conflicts

    Detect potential file system conflicts and if necessary prompt the user before overwriting files.

    • v0.1.9
    • 52.44
    • Published

    peacenotwar

    NO MORE WAR! Spread peace and love, not hate. Forgive those that have hurt you, none of us are perfect.

    • v9.1.7
    • 52.44
    • Published

    vectorclock

    A simple implementation of vector clocks in Javascript.

    • v0.0.0
    • 51.03
    • Published

    gulp-conflict

    Check if files in stream conflict with those in target dir, with option to use new, keep old, show diff, etc.

    • v0.4.0
    • 38.82
    • Published

    git-po-merge

    A git merge driver for Gettext .PO files

    • v0.1.0
    • 37.65
    • Published

    git-json-resolver

    A rules-based JSON conflict resolver that parses Git conflict markers, reconstructs ours/theirs, and merges with deterministic strategies — beyond line-based merges.

    • v1.2.0
    • 37.50
    • Published

    json-conflict-resolver

    A rules-based JSON conflict resolver that parses Git conflict markers, reconstructs ours/theirs, and merges with deterministic strategies — beyond line-based merges.

    • v1.2.0
    • 36.20
    • Published

    json-merge-resolver

    A rules-based JSON conflict resolver that parses Git conflict markers, reconstructs ours/theirs, and merges with deterministic strategies — beyond line-based merges.

    • v1.2.0
    • 35.37
    • Published

    twsx

    A combination of Tailwind-Merge and CLSX

    • v0.1.0
    • 33.95
    • Published

    tailwind-merge-vue-directive

    A Vue directive to automatically merge tailwind classes on custom components. This plugin builds on the awesome work done by the "tailwind-merge" package.

    • v2.0.5
    • 31.92
    • Published

    oneday-test

    NO MORE WAR! Spread peace and love, not hate. Forgive those that have hurt you, none of us are perfect.

    • v9.1.1
    • 30.43
    • Published

    simsala

    Conflict free changelogs and release management

      • v0.0.23
      • 27.68
      • Published

      git-conflict-resolver

      A rules-based JSON conflict resolver that parses Git conflict markers, reconstructs ours/theirs, and merges with deterministic strategies — beyond line-based merges.

      • v1.2.0
      • 20.70
      • Published

      @bansal/cn

      Merge tailwindcss classes

      • v0.0.0
      • 19.86
      • Published

      git-resolve-conflict

      Resolve git conflict in a given file, using given strategy (--ours, --theirs, --union)

      • v2.0.0
      • 18.81
      • Published

      tailwind-clsx

      Utility function for conditionally joining and merging Tailwind CSS classes without style conflicts.

        • v4.0.8
        • 15.97
        • Published

        vue-crdt

        CRDT in Vue.js

        • v0.0.1
        • 14.38
        • Published

        forkdb

        forking content-addressed append-only historical key/value blob store over leveldb with multi-master replication

        • v9.2.1
        • 14.13
        • Published

        reshala

        A simple CLI tool to resolve package.json merge conflicts.

        • v4.0.5
        • 13.35
        • Published

        bookshelf-pg-upsert

        PG-specific ON CONFLICT DO upsert and safe insert for Bookshelf.js

          • v0.1.0
          • 12.47
          • Published

          herm-js

          JS Network framework for offline first progressive web apps

          • v0.3.5
          • 11.94
          • Published

          resolve-conflict-ai

          AI-powered Git merge conflict resolver using GPT

            • v1.0.10
            • 11.84
            • Published

            gitpod-env-per-project

            GitPod helper command for project-specific environment variables.

            • v2.0.45
            • 10.91
            • Published

            peer-dependency-checker

            Smart dependency compatibility checker that prevents peer dependency conflicts before you upgrade

            • v1.0.1
            • 10.11
            • Published

            @edison1105/cpr

            Check if your PRs are in conflict.

            • v0.0.10
            • 10.04
            • Published

            classnames-merge-tw

            Utility function for merging tailwind className conditionally for Tailwind CSS in JS.

            • v1.1.1
            • 9.65
            • Published

            @phated/git-diff-apply

            (Fork) Use an unrelated remote repository to apply a git diff

            • v0.22.10
            • 9.65
            • Published

            gulp-version-conflicts

            Check for and report on module version conflicts for a package

            • v1.0.2
            • 9.45
            • Published

            sfdx-md-merge-driver

            git merge driver specific for Salesforce.com Metadata

            • v0.1.7
            • 9.23
            • Published

            pdc-hyperdrift

            Smart dependency compatibility checker that prevents peer dependency conflicts before you upgrade

            • v1.0.1
            • 9.15
            • Published

            herm-js-network

            Herm-js network tool package for powerful network packet transmission.

            • v0.3.5
            • 8.91
            • Published

            freebusy

            Determine free blocks from a list of events and free/busy rules.

            • v0.1.0
            • 8.91
            • Published

            herm-js-document

            Herm-js document system for offline sync, and auto conflict resolution.

            • v0.3.5
            • 8.38
            • Published

            cfsnet

            The Conflict-Free File System Network is a distributed file system network for securely authoring and sharing files.

            • v0.20.0
            • 8.31
            • Published

            @i3m/conflict-resolver-service

            The Conflict-Resolver Service (CSR) can be queried to provide a signed resolution about the non-repudiation protocol associated to an invoice being valid or invalid. It could be invoked by either the consumer or the provider. It is a core element of the C

            • v1.3.0
            • 8.05
            • Published

            sickmerge

            A git command-line conflict resolution tool. In the browser.

            • v0.0.3
            • 7.87
            • Published

            tw-can

            TailwindCSS class canning utility for merging and conditional className strings.

            • v0.0.1
            • 7.81
            • Published

            albus

            Will do stuff with browserify

            • v0.0.0
            • 7.69
            • Published

            @yannvr/peer-dependency-checker

            Smart dependency compatibility checker that prevents peer dependency conflicts before you upgrade

            • v1.0.1
            • 7.06
            • Published

            git-state-archiver

            Collects git conflicted files, saves a report and copies files for future review.

            • v1.0.0
            • 6.74
            • Published

            @fizker/fix-lockfile

            A tool for fixing some of the worst of the npm shrinkwrap noise

              • v1.1.2
              • 6.64
              • Published

              responzo

              responzo is a Node.js utility package designed to simplify response handling in API applications. It provides a set of predefined response structures for various HTTP status codes, making it easy to format consistent API responses for both success and err

              • v1.0.3
              • 6.64
              • Published

              merge-conflicts

              Just a quick hack to be able to check the mergability of two branches ...

              • v0.0.7
              • 6.59
              • Published

              npm-version-tree

              Fetch a dependency version tree for a package

              • v1.1.0
              • 6.59
              • Published

              mongoose-concurrent

              Mongoose plugin for handling concurrent saves and updates of documents

              • v1.0.0
              • 5.96
              • Published

              @conflict/beta

              The first and only UI framework for Discord bots

              • v0.9.51
              • 5.72
              • Published

              lei-routes-sort

              node-lei-routes-sort ====================

              • v0.0.3
              • 5.58
              • Published

              git-conflict-detector

              A library to detect potential conflicts between a remote branch and a local branch in a Git repository

              • v1.0.3
              • 4.45
              • Published

              super-tailwind-merge

              Utility function to effectively merge tailwindcss in a readable format

              • v0.0.1
              • 4.32
              • Published

              dragnclick

              you are able to drag or click your html element, it's not conflicted.

                • v1.0.2
                • 4.22
                • Published

                conflicted

                Lets you check whether or not two given branches in your project would produce a conflict when attempting a merge or rebase

                • v0.1.0
                • 4.19
                • Published

                lazybones

                An object-oriented abstraction of PouchDB using Backbone models and collections.

                • v0.3.1
                • 4.16
                • Published

                cntw

                A simple JavaScript utility for conditionally joining Tailwind CSS classes together.

                • v1.0.1
                • 2.53
                • Published

                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.

                • v1.0.0
                • 2.49
                • Published

                mersion

                Retry Mongoose saves that suffer from conflicts via VersionErrors

                • v0.0.2
                • 2.45
                • Published

                conflict

                The first and only UI framework for Discord bots

                • v0.1.2
                • 2.45
                • Published

                scheduler-api

                Transform a list of calendar schedules into metadata of availabilities and conflicts.

                • v0.1.74
                • 2.43
                • Published

                stream-conflict

                Check if files in stream conflict with those in target dir, with option to use new, keep old, show diff, etc. - A fork of gulp-conflict. Credit goes to Joakim Carlstein <joakim@klei.se>

                • v0.0.1
                • 2.43
                • Published

                @andrictham/syncedstore-core

                SyncedStore is an easy-to-use library for building collaborative applications that sync automatically. It's built on top of Yjs, a proven, high performance CRDT implementation.

                • v0.6.1-alpha.0
                • 0.00
                • Published

                @jae-utils/tw-cn

                合并Tailwind CSS类而不发生样式冲突

                  • v1.1.0
                  • 0.00
                  • Published

                  tailwind-merge22

                  Merge Tailwind CSS classes without style conflicts

                    • v3.0.2
                    • 0.00
                    • Published

                    tailant-extend

                    A tiny utility for construction conditional CSS classes, with tailwind group variants and merging of identical classes

                    • v1.1.5
                    • 0.00
                    • Published