git : empty ident name (for <>) not allowed
This diff file is a plain diff, not something generated by git format-patch
. A format-patch
generated diff contains information about the commit author, author date, commit message, ... and maintains this information when creating the commit(s).
Your plain diff does not have these information, so git am
will complain that it is missing naturally.
You should instead have used git apply
which is meant to apply simple patch files like you have in this case which will only apply the patch to the worktree (and index if you tell it to) but does not create any commit automatically.
Use,
git apply -3 patchName.patch
when you encounter conflicts, open your mergtool and resolve conflicts
git mergetool
that's all :)