reddit / emacs

diff: git rejects: how to apply at arbitrary location?

jayaura · 2022-02-07 16:23
I have a rejected diff from git am, diff algo cannot figure out where to apply them. When the particular reject is just addition, i'd simply like to have it applied at the cursor position of my interest. How can I achieve this? When I split the diff and apply, it does so to a location that is incorrect. EDIT: How to do this in emacs when using magit and diff mode (or some other modes that I dont know of).
nv-elisp · 2022-02-07 16:34
r/git? Or rephrase your question so this clear how it relates to Emacs.
jayaura · 2022-02-08 14:26
Thank you! I've clarified in the post. Its not a git question though. I know how to do it with git in the usual way