You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
JGit currently lacks support for git reset --merge (stubs for this have already been added in org.eclipse.jgit.api.ResetCommand.ResetType, but were never implemented).
Motivation
The purpose of this reset mode is to recover cleanly from merge conflicts and is a prerequisite for supporting multi-commit git cherry-pick --continue/--skip/--abort in JGit (work for this was already started in #301 which adds the support for writing the sequencer state for CherryPickCommand/RevertCommand)
Reset the index and update the files in the working tree that are different between <commit> and HEAD, but keep those which are different between the index and working tree (i.e. which have changes which have not been added). Mainly exists to reset unmerged index entries, like those left behind by git am -3 or git switch -m in certain situations. If a file that is different between <commit> and the index has unstaged changes, reset is aborted.
Activity
r-mennig commentedon Nov 3, 2026
PR: https://eclipse.gerrithub.io/c/eclipse-jgit/jgit/+/1257709