How can we resolve git patch merge conflicts manually on a system where no graphical diff/merge tool is available

Question

I am facing an issue when applying git patch to a branch. Following command is showing that patch can not be applied but git mergetool is not showing any conflicts

git am -3 < changes.patch

Found something similar at: git am error: "patch does not apply"

Open with any text editor and look for strings of the form `<<<<`, `=====` and `>>>>>` — user1952500, Mar 26 '17 at 06:23

score 1 · Answer 1 · answered Mar 26 '17 at 06:20

You can type git status and all the files with the merge conflicts will be with the status of both modified.

Than you can simply edit them with any editor like vi/nano and resolve the conflicts.

You can also add the --reject flag and the rejected parts will be written to a .rej file

How can we resolve git patch merge conflicts manually on a system where no graphical diff/merge tool is available

1 Answers1