jonatanpedersen/git-json-merge jonatanpedersen/git-json-merge

  • Stars
    star
    97
  • Rank 348,505 (Top 7 %)
  • Language
    JavaScript
  • License
    MIT License
  • Created almost 9 years ago
  • Updated almost 2 years ago
Twitter logo Share LinkedIn logo Share Facebook logo Share
jonatanpedersen/git-json-merge
github

jonatanpedersen

Reviews

There are no reviews yet. Be the first to send feedback to the community and the maintainers!

Repository Details

A git merge driver that use xdiff to automatically resolve merge conflicts in json files. This project was inspired by git-po-merge.

More Repositories

1

fun-with-events

This is an ongoing exploration of CQRS, Event Sourcing, Pub/Sub and Dependency Injection in the context of ES6/7 and a variation of S.O.L.I.D. principles applied to functions rather than classes.
JavaScript
4
star
2

constipated

relieves files, globs and strings
JavaScript
3
star
3

hubsync

Clones/pulls all personal and organization repositories.
JavaScript
3
star
4

css-bingo

Every byte counts when creating good user experiences for mobile devices and slow networks. Don't let the browser do unnecessary work. css-bingo finds all extraneous rules and selectors in your CSS, not used in your html, and removes them.
JavaScript
3
star
5

angular-nomnoml

Hello, this is angular-nomnoml, an angular module and directive for nomnoml, the awesome tool for drawing UML diagrams by Daniel Kallin.
JavaScript
2
star
6

mocha-pug-lint

Runs pug-lint as mocha tests.
JavaScript
1
star
7

npm-save-installed

Updates package.json with the exact version of the installed package in the node_modules directory. Useful for forcing installation of exact commit of git dependencies (packages not hosted on NPM).
JavaScript
1
star
8

textual-app

Take back control of your texts...
JavaScript
1
star
9

jambon

Http listener composed with higher order functions returning immutable request/response context reducers
TypeScript
1
star
10

wigo

What Is Going On?
JavaScript
1
star