gix-merge v0.2.0

Bug Fixes

• don't incorrectly mark as auto-resolved conflict if there was none.
  Previously it was possible to mark perfectly working content merges as conflicting
  if we would choose 'our' or 'their' resolution.
• when binary merges are performed, adjust the returned resolution to indicate auto-resolution.
  Previously it wasn't possible to detect auto-resolution, even though it can be assumed if a
  resolution mode was provided.

New Features (BREAKING)

• replace tree::Options::allow_lossy_resolution with *::tree_conflicts.
  That way it's possible to steer how to resolve tree-related conflicts while
  making it possible to detect that a conflict happened.

Bug Fixes (BREAKING)

• assure that tree::apply_index_entries() cannot unknowingly leave unconflicted and conflicted entries.
  This is a massive footgun currently where incorrect usage is very likely while causing all kinds of mistakes.

Commit Statistics

• 12 commits contributed to the release over the course of 28 calendar days.
• 28 days passed between releases.
• 4 commits were understood as conventional.
• 0 issues like '(#ID)' were seen in commit messages

Commit Details

view details

• Uncategorized
  • Release gix-date v0.9.3, gix-object v0.46.1, gix-command v0.4.0, gix-filter v0.16.0, gix-fs v0.12.1, gix-traverse v0.43.1, gix-worktree-stream v0.18.0, gix-archive v0.18.0, gix-ref v0.49.1, gix-prompt v0.9.0, gix-url v0.28.2, gix-credentials v0.26.0, gix-diff v0.49.0, gix-dir v0.11.0, gix-revision v0.31.1, gix-merge v0.2.0, gix-pack v0.56.0, gix-odb v0.66.0, gix-shallow v0.1.0, gix-packetline v0.18.2, gix-transport v0.44.0, gix-protocol v0.47.0, gix-status v0.16.0, gix-worktree-state v0.16.0, gix v0.69.0, gitoxide-core v0.44.0, gitoxide v0.40.0, safety bump 16 crates (c1ba571)
  • Update changelogs prior to release (7ea8582)
  • Merge pull request #1705 from GitoxideLabs/merge (520c832)
  • Adapt to changes in gix-diff related to not tracking empty blobs anymore. (f53cec5)
  • Don't incorrectly mark as auto-resolved conflict if there was none. (da585db)
  • Assure that tree::apply_index_entries() cannot unknowingly leave unconflicted and conflicted entries. (3e94b58)
  • Implement support for resolving irreconcilable tree conflicts with 'ours' or 'ancestor' (e487cca)
  • Merge pull request #1708 from EliahKagan/run-ci/mode (34efe03)
  • Add missing executable bits on fixture scripts (ed757ea)
  • Replace tree::Options::allow_lossy_resolution with *::tree_conflicts. (1c3ba81)
  • When binary merges are performed, adjust the returned resolution to indicate auto-resolution. (a57192c)
  • Merge pull request #1701 from GitoxideLabs/release (e8b3b41)