Code

more merge features#1661

Code

Merged

Byron merged 12 commits intomainGitoxideLabs/gitoxide:mainfrom mergeGitoxideLabs/gitoxide:mergeCopy head branch name to clipboardNov 24, 2024

+1,302-760

Commits

Commits on Nov 22, 2024

• feat: when blob-merging, clarify if something would have conflicted.

  Byron

  committed
  09213bc

  Copy full SHA for 09213bc

• feat!: Add more modes for checking for unresolved conflicts.

  Show description for aff76f2
  Byron

  committed
  aff76f2

  Copy full SHA for aff76f2

• adapt to changes in gix-merge.

  Byron

  committed
  47110d6

  Copy full SHA for 47110d6

• add a note about remote-helpers in crate-status (#1666)

  Show description for 36aaf17
  Byron

  committed
  36aaf17

  Copy full SHA for 36aaf17

Commits on Nov 24, 2024

• feat: entry::Stage can now be converted into entry::Flags.

  Show description for 63978f6
  Byron

  committed
  63978f6

  Copy full SHA for 63978f6

• fix: tree() diffing now also recognizes merge mode changes as modification.

  Byron

  committed
  e00e454

  Copy full SHA for e00e454

• feat: octal Debug representation of tree::EntryMode.

  Show description for cd61c25
  Byron

  committed
  cd61c25

  Copy full SHA for cd61c25

• feat: add gix merge commit --debug

  Show description for 0a5993f
  Byron

  committed
  0a5993f

  Copy full SHA for 0a5993f

• fix: Repository::tree_merge_options() now comes with rewrite tracking.

  Show description for b57be71
  Byron

  committed
  b57be71

  Copy full SHA for b57be71

• feat: add tree_with_rewrites::Change(Ref)::source_mode_and_id|mode_and_id()

  Byron

  committed
  5db2d2d

  Copy full SHA for 5db2d2d

• feat: provide a way to record and apply index changes.

  Show description for 3ee8b62
  Byron

  committed
  3ee8b62

  Copy full SHA for 3ee8b62

• feat: Add support for index application in merge results via merge::tree::Outcome::index_changed_after_applying_conflicts()

  Byron

  committed
  71b0cea

  Copy full SHA for 71b0cea