Hi,
I just experienced a `git cherry-pick <commit> --no-rerere-autoupdate` where the
conflict still got automatically resolved from rerere.
Is this a known bug, or am I doing something wrong?
$ git cherry-pick 61c16c9 --no-rerere-autoupdate
Auto-merging crates/common/tedge_utils/src/file.rs
CONFLICT (content): Merge conflict in crates/common/tedge_utils/src/file.rs
error: could not apply 61c16c9cd... Fix (style): Do not use dedicated statement for return value
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
Resolved 'crates/common/tedge_utils/src/file.rs' using previous resolution.
Using
$ git --version
git version 2.36.0
Best,
Matthias
--
Mit freundlichen Grüßen,
Kind regards,
Matthias Beyer