Commit History

Author SHA1 Message Date
  Andelf e8bf419596 fix(sync): tune merge priority, current change first 2 years ago
  Junyi Du da97d7620e fix: ast->diff-block pre-block meta raw-body 2 years ago
  Andelf a59ecb370d chore(deps): bump diff-merge to 0.1.0 2 years ago
  Andelf 2c41d4a20d chore: cleanup debug print 2 years ago
  rcmerci e11b72a7c3 fix txid update when remote->local failed, add retry-count to remote->local-full-sync 2 years ago
  Andelf 94ba175cd7 refactor: rewrite merge logic 2 years ago
  Andelf f5c95dee6d fix(diff-merge): org mode handling 2 years ago
  Andelf fd493bde0d fix(diff-merge): multi-line blocks format 2 years ago
  Junyi Du fb4e23bb95 fix: handle multi-line blocks spaces correctly 2 years ago
  Andelf 5037483b25 fix(diff-merge): handle multi-line blocks for md 2 years ago
  Andelf 2e9e771387 enhance(sync): deletion handling 2 years ago
  Andelf 1c6fe4be82 enhance(sync): add merge step to update local 2 years ago
  Junyi Du 497284bd08 dev (doc): minor docstring updates 2 years ago
  Junyi Du df8549493f dev: update ast->diff-blocks comment 2 years ago