git-subline-merge
git-subline-merge copied to clipboard
paulaltin
An interactive git merge driver which can resolve non-overlapping conflicts on individual or adjacent lines.
Google git-subline-merge and you won't find this. What about `git-hires-merge`?
Under magit in Emacs, I just did a "rebase onto…" and it invoked git-subline-merge's user interaction in the *magit-process* buffer, which kinda doesn't work: ``` run git … rebase davea/x-y-z...
Sometimes it would be useful to run a subline merge but then manually tweak the result before committing it. For example, given a conflicted hunk where one branch renamed a...
Right now when resolving a merge conflict, interactive.singlekey is not supported unlikely when selecting hunks to stage/commit. see https://git-scm.com/docs/git-config#Documentation/git-config.txt-interactivesingleKey
Running git-subline-merge in interactive mode on macOS 13 prints this message before each version of a conflicted hunk: ``` diff: unrecognized option `--old-group-format=D%de+%dn,%dE+%dN' usage: diff [-aBbdilpTtw] [-c | -e |...