我正在尝试从已删除某些已在目标分支中修改的文件的源分支合并。我想忽略删除并简单地接受目标分支已经拥有的内容。
当我:
git merge -s recursive -X ours master
的输出git status
是:
# On branch nyap-artifactory
# Changes to be committed:
#
# new file: file-re-added-by-source-branch-that-should-be-deleted
# modified: file-modified-by-source-branch
#
# Unmerged paths:
# (use "git add/rm <file>..." as appropriate to mark resolution)
#
# deleted by them: file-deleted-by-source-branch-that-should-be-kept
下一步是什么?