git : empty ident name (for <>) not allowed

前端 未结 4 2096
没有蜡笔的小新
没有蜡笔的小新 2021-02-02 08:07

I was applying a diff file of an opensource project on the top of my repository using git-am :

 git am -3 < /Downloads/refactorWork.diff

but

4条回答
  •  情深已故
    2021-02-02 08:28

    Use,

    git apply -3 patchName.patch

    when you encounter conflicts, open your mergtool and resolve conflicts

    git mergetool

    that's all :)

提交回复
热议问题