movableink/three-way-merge movableink/three-way-merge

  • Stars
    star
    23
  • Rank 1,016,462 (Top 21 %)
  • Language
    TypeScript
  • License
    MIT License
  • Created about 7 years ago
  • Updated over 1 year ago
Twitter logo Share LinkedIn logo Share Facebook logo Share
movableink/three-way-merge
github

movableink

Reviews

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

Repository Details

Javascript/typescript library for performing three-way merges and diffs

More Repositories

1

doorman

HTTP Proxy + OAuth
JavaScript
167
star
2

cximage

cximage 7.0.1 mirror
C++
73
star
3

ember-cli-emscripten

Compile c/c++ inside ember projects using emscripten
JavaScript
30
star
4

three-gif-loader

Three.js plugin for loading animated gifs as textures
JavaScript
28
star
5

ember-pop-over

A pop-over component for Ember apps
JavaScript
15
star
6

buffered-proxy

Ember mixin for buffering changes to an ObjectProxy
JavaScript
14
star
7

cropduster

Support tools for Movable Ink Web Crops
JavaScript
12
star
8

free-transform-example

How to implement free transforms in Ember. Check out the branches for the various stages.
JavaScript
10
star
9

ember-cli-qrcode

QR code components for Ember applications
JavaScript
6
star
10

ember-data-json-api-bulk-ext

Decorator to add support to Ember Data for the JSON:API Bulk Extension
JavaScript
5
star
11

tailwind-config

Tailwind Config for Fluid
JavaScript
5
star
12

gif-inspector

JavaScript
5
star
13

follow-redirect-node

follow redirects using node.js
4
star
14

movable-cli

Command-line utilities for building Studio apps
JavaScript
4
star
15

fluid

A Design Framework for fluid & reactive interfaces
JavaScript
4
star
16

api-stub

Fake API server for simulating response times
JavaScript
4
star
17

ics-generator

Generate calendar events
4
star
18

Developer-Docs

Developer Documentation for Movable Ink
3
star
19

depl

Deploy control tool
Ruby
3
star
20

data-source.js

JavaScript
3
star
21

clubhouse-slack-filter

Filter messages that come from clubhouse into slack
JavaScript
2
star
22

dependabot-clubhouse-actions

Automatically create a Clubhouse story for every Dependabot PR
TypeScript
2
star
23

template-lint-plugin

Custom `ember-template-lint` rules for Movable Ink
JavaScript
2
star
24

rollup-split-index

Given an es6 input file, output its dependencies in a separate bundle
JavaScript
2
star
25

deploy_s3

write deploy git hashes to s3
Ruby
1
star
26

ios-test-shopping-cart-app

Swift
1
star
27

lint-config

Shared lint configuration for Movable Ink
JavaScript
1
star
28

vessel

Deploys an EC2 instance to ship and process CSV files on S3
Clojure
1
star
29

ios-sdk

Swift
1
star
30

python-demo

Python app that demonstrates a Movable Ink source. Live demo: http://movableink-python-demo.heroku.com
JavaScript
1
star
31

facebook-testbed

Sample Facebook app that integrates Movable Ink social interactions
Ruby
1
star
32

generator-map-helper

Generate apps for MI crops
HTML
1
star
33

owncloud-flat

Flat UI theme for OwnCloud
CSS
1
star
34

socketproxy

Expose a local node http handler via a remote URL
JavaScript
1
star
35

ember-bar-chart

A simple, declarative Ember component for rendering SVG bar charts
JavaScript
1
star
36

u-mann-whitney

U Mann-Whitney test extracted from sciruby/statsample
Ruby
1
star
37

ember-cli-handlebars-inline-precompile

Precompiled Handlebars templates for Ember (a corollary to ember-cli-htmlbars-inline-precompile)
JavaScript
1
star
38

brutus

A load testing tool
Go
1
star
39

awslib

MovableInk::AWS gem
Ruby
1
star
40

mdk-demo-app

Sample app using the MDK
HTML
1
star
41

homebrew-formulas

Ruby
1
star
42

unique_list

A ruby coding assignment
Ruby
1
star
43

ruby-demo

Sinatra app that demonstrates a Movable Ink source. Live demo: http://movableink-ruby-demo.heroku.com
JavaScript
1
star
44

ember-pausable-test

Wrangle your very async tests.
JavaScript
1
star