thecodrr 35995784d9 fix: merge conflict detection when merging via sse

2020-08-25 08:52:12 +05:00

..

__tests__

ci: fix merger test

2020-08-24 11:14:04 +05:00

collector.js

sync: prepare -> collector, other optimizations

2020-04-16 03:04:44 +05:00

conflicts.js

sync: prepare -> collector, other optimizations

2020-04-16 03:04:44 +05:00

index.js

fix: merge conflict detection when merging via sse

2020-08-25 08:52:12 +05:00

merger.js

merger: handle deleted delta merge conflict

2020-04-16 11:21:02 +05:00

utils.js

ci: add more tests and general fixes

2020-04-09 16:36:57 +05:00