Novelty Plastic Moustache

    25 packages found

    Merge Tailwind CSS classes without style conflicts

    published 1.2.1 2 months ago
    M
    Q
    P

    A precommit hook to warn you about merge conflicts introduced with other branches of your app

    published 1.4.7 4 years ago
    M
    Q
    P

    Performs insert-updates of a couchdb document with configurable conflict resolution.

    published 1.0.0 3 years ago
    M
    Q
    P

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

    published 0.0.3 8 years ago
    M
    Q
    P

    Merge Tailwind CSS classes without style conflicts

    published 1.2.0 3 months ago
    M
    Q
    P

    A git merge driver for Gettext .PO files

    published 0.1.0 7 years ago
    M
    Q
    P

    some interfaces for work with git repository

    published 2.1.2 a month ago
    M
    Q
    P
    M
    Q
    P

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

    published 4.0.5 3 months ago
    M
    Q
    P

    Use an unrelated remote repository to apply a git diff

    published 3.0.0 a year ago
    M
    Q
    P

    Resolve multiple image conflicts at the same time

    published 1.32.1 5 years ago
    M
    Q
    P

    git merge driver for automatically merging lockfiles

    published 2.3.6 2 years ago
    M
    Q
    P

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

    published 1.1.2 2 years ago
    M
    Q
    P

    Merge two simple javascript objects, with controllable logic for conflicts.

    published 1.3.0 2 years ago
    M
    Q
    P

    Utility to merge two Signal K objects, resolving conflicts using the timestamp of child objects.

    published 0.1.9 8 years ago
    M
    Q
    P

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

    published 0.22.10 2 years ago
    M
    Q
    P

    Resolve data table conflicts one step at a time.

    published 3.2.1 7 years ago
    M
    Q
    P

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

    published 2.0.0 2 years ago
    M
    Q
    P

    git merge driver specific for Salesforce.com Metadata

    published 0.1.29 2 years ago
    M
    Q
    P

    Manual merge tool

    published 1.5.0 6 years ago
    M
    Q
    P