主页 / unix / 问题 / 705186
Accepted
xpt
Asked: 2022-06-07 10:54:48 +0800 CST

没有拒绝的补丁

  • 772

这可能已经回答了，但很难搜索——基本上，

当patch发现一个block/hunk 无法申请时，它会将更改的hunk 拒绝到reject 文件中。

如何不将冲突放入拒绝文件但包含在最终输出中，就像找到git冲突并将两个版本都包含在最终输出中一样：

$ cat merge.txt
<<<<<<< HEAD
this is some content to mess with
content to append
=======
totally different content to merge later
>>>>>>> new_branch_to_merge_later
diff patch

1 个回答

  1. Best Answer

    GNU补丁有一个--merge选项：

    --merge or --merge=merge or --merge=diff3
  Merge a patch file into the original files similar to diff3(1)
  or merge(1).  If a conflict is found, patch outputs a warning
  and brackets the conflict with <<<<<<< and >>>>>>> lines.  A
  typical conflict will look like this:

      <<<<<<<
      lines from the original file
      |||||||
      original lines from the patch
      =======
      new lines from the patch
      >>>>>>>

  The optional argument of --merge determines the output format
  for conflicts: the diff3 format shows the ||||||| section with
  the original lines from the patch; in the merge format, this
  section is missing.  The merge format is the default.

  This option implies --forward and does not take the --fuzz=num
  option into account.

    奇怪的是，我在GNU diffutils 文档（记录了其他patch选项）中找不到这个。

    • 2

相关问题