Skip to content

Latest commit

 

History

History
91 lines (61 loc) · 2.37 KB

CHANGES.rst

File metadata and controls

91 lines (61 loc) · 2.37 KB
Raw

Changes

Version 0.7.5

  • In dict_merger head is always kept if root matches update.
  • In dict_merger update is always kept if root matches head.

Version 0.7.4

  • KEEP_UPDATE_CONFLICT_ON_HEAD_DELETE doesn't take the root into account any longer.

Version 0.7.3

  • Add new typoe of conflict INSERT.
  • KEEP_HEAD_ENTITIES_CONFLICT_ON_NEW_UPDATE will create INSERT conflict instead of REMOVE one.

Version 0.7.2

  • Add new strategy KEEP_HEAD_ENTITIES_CONFLICT_ON_NEW_UPDATE which will create conflict when there is a new value in update.

Version 0.7.1

  • Fix bug when DictMergeOps.keep_longest is used inside lists.

Version 0.7.0

  • Add a new strategy for conflicts on head delete (contrib).

Version 0.6.1

  • Smarter handling of conflicts in case of authors with the same name (contrib).

Version 0.6.0

  • Correctly handle unicode in author names (contrib).

Version 0.5.2:

  • Fix duplicate patches.

Version 0.5.1:

  • Fix patch_to_conflict_set for list patches.

Version 0.5.0:

  • Conflict method to_json it returns a list of patches conflicts of a single one.

Version 0.4.0:

  • It's now possible to have field- and content- dependent merger operations.

Version 0.3.2:

  • Initial public release.