Svn 如何使用Mac上的终端以不同方式解决同一文件中的多个冲突？

当我试图将代码从主干合并到分支时，会出现这种冲突。 在这个文件中，出现了多个冲突，我需要分别解决每个冲突。我对使用SVN非常陌生，我正在使用terminal提交我的代码。 以下是冲突：

    Select: (p) postpone, (df) diff-full, (e) edit, (r) resolved,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options: dc      
    @@
            }

          } // end of whilefor loop for condition
    <<<<<<< MINE (select with 'mc') (1571,3)

          if(!ifScriptForPrimitiveFactFields.isEmpty()) {
            ifScriptForPrimitiveFactFields += " && (" + ifVerScriptForPrimitiveFactFields + " || hasChanged )";
    ||||||| ORIGINAL (1575,6)

          if (ifScriptForPrimitiveFactFields != null && !ifScriptForPrimitiveFactFields.isEmpty()) {
            if (rule != null && rule.isTriggerApprovalsOnValuesChange() && ifVerScriptForPrimitiveFactFields != null 
                && !ifVerScriptForPrimitiveFactFields.isEmpty()) {
              ifScriptForPrimitiveFactFields += " && (" + ifVerScriptForPrimitiveFactFields + " || hasChanged )";
            }
    =======

          if (ifScriptForPrimitiveFactFields != null && !ifScriptForPrimitiveFactFields.isEmpty()) {
            if (rule != null && rule.isTriggerApprovalsOnValuesChange() && ifVerScriptForPrimitiveFactFields != null
                && !ifVerScriptForPrimitiveFactFields.isEmpty()) {
              ifScriptForPrimitiveFactFields += " && (" + ifVerScriptForPrimitiveFactFields + " || hasChanged )";
            }
    >>>>>>> THEIRS (select with 'tc') (1575,6)
          } else {
            if(rule != null && rule.isTriggerApprovalsOnValuesChange()) {
              ifScriptForPrimitiveFactFields = "(!idToObjMap || hasChanged)";
    @@
        if(verDataMap != null) {
          idField = verDataMap.get("ID_FIELD");
        }
    <<<<<<< MINE (select with 'mc') (2313,3)
        versionCondition = "(!idToObjMap "
            + "|| (!idToObjMap?.get(i." + idField + ")) || (idToObjMap?.get(i." + idField 
            + ") && i." + factFieldScriptMappingString + subFieldStr + "!=idToObjMap?.get(i."+ idField + ")?." + factFieldScriptMappingString + subFieldStr + ")) ";
    ||||||| ORIGINAL (2334,3)
        versionCondition = "(" + Constants.IS_FIRST_SALES_APPROVAL + " || (idToObjMap?.get(i." + idField
            + ") && i." + factFieldScriptMappingString + subFieldStr + "!=idToObjMap?.get(i." + idField + ")?."
            + factFieldScriptMappingString + subFieldStr + ")) ";
    =======
        versionCondition = "(" + Constants.IS_FIRST_SALES_APPROVAL + " || (idToObjMap?.get(i." + idField + ") && i."
            + factFieldScriptMappingString + subFieldStr + "!=idToObjMap?.get(i." + idField + ")?."
            + factFieldScriptMappingString + subFieldStr + ")) ";
    >>>>>>> THEIRS (select with 'tc') (2334,3)
        return versionCondition;
      }

    @@

        Date addedDate = businessCalendar.add(submitDate, duration);
        long durationSecs = addedDate.getTime() - submitDate.getTime();
    <<<<<<< MINE (select with 'mc') (2330,3)
        expression = "(" + factFieldScriptMapping + ">=" + "order_submit_date) && (" + factFieldScriptMapping + "<="
            + "order_submit_date" + "+" + durationSecs + ")";
        return expression;
    ||||||| ORIGINAL (2351,3)
        expression = "(" + factFieldScriptMapping + "<=" + "order_submit_date ) && (" + durationSecs + "+"
            + factFieldScriptMapping + ">= " + "order_submit_date )";
        return expression;
    =======
        if (hours == 0) {
          return "(new Date(" + factFieldScriptMapping + ").getDay()" + "=="
              + "new Date(order_submit_date).getDay()) && ((" + factFieldScriptMapping + "-" + "order_submit_date"
              + ").abs()" + "<" + "86400000)";
        } else {
          expression = "(" + factFieldScriptMapping + ">" + "order_submit_date) && (" + factFieldScriptMapping + "<"
              + "order_submit_date" + "+" + durationSecs + ")";
          return expression;
        }
    >>>>>>> THEIRS (select with 'tc') (2351,9)
      }

      private String isWithinXWorkingDaysofSubmitForApprovals(List<String> values, String factFieldScriptMapping) {
    @@
              + "order_submit_date" + "+" + durationSecs + ")";
          return expression;
        }
    <<<<<<< MINE (select with 'mc') (2352,5)
        Date addedDate = businessCalendar.add(submitDate, duration);
        long durationSecs = addedDate.getTime() - submitDate.getTime();
        expression = "(" + factFieldScriptMapping + ">=" + "order_submit_date) && (" + factFieldScriptMapping + "<="
            + "order_submit_date" + "+" + durationSecs + ")";
        return expression;
    ||||||| ORIGINAL (2373,5)
        Date addedDate = businessCalendar.add(submitDate, duration);
        long durationSecs = addedDate.getTime() - submitDate.getTime();
        expression = "(" + factFieldScriptMapping + "<=" + "order_submit_date ) && (" + durationSecs + "+"
            + factFieldScriptMapping + ">= " + "order_submit_date )";
        return expression;
    =======
    >>>>>>> THEIRS (select with 'tc') (2382,0)
      }

      private String isWithinXhoursofSubmitForApprovals(List<String> values, String factFieldScriptMapping) {
    <<<<<<< MINE (select with 'mc') (2360,2)
        return "(" + factFieldScriptMapping + ">=" + "order_submit_date) && (" + factFieldScriptMapping + "<="
            + "order_submit_date" + "+" + Long.parseLong(values.get(0)) * 3600000 + ")";
    ||||||| ORIGINAL (2381,2)
        return "(" + factFieldScriptMapping + "<=" + "order_submit_date ) && (" + Long.parseLong(values.get(0)) * 3600000
            + "+" + factFieldScriptMapping + ">=" + "order_submit_date )";
    =======
        if (Long.parseLong(values.get(0)) == 0) {
          return "(new Date(" + factFieldScriptMapping + ").getDay()" + "=="
              + "new Date(order_submit_date).getDay()) && ((" + factFieldScriptMapping + "-" + "order_submit_date"
              + ").abs()" + "<" + "86400000)";
        } else {
          return "(" + factFieldScriptMapping + ">" + "order_submit_date) && (" + factFieldScriptMapping + "<"
              + "order_submit_date" + "+" + Long.parseLong(values.get(0)) * 3600000 + ")";
        }
    >>>>>>> THEIRS (select with 'tc') (2385,8)
      }

      private String isWithinXdayofSubmitForApprovals(List<String> values, String factFieldScriptMapping) {
    <<<<<<< MINE (select with 'mc') (2365,2)
        return "(" + factFieldScriptMapping + ">=" + "order_submit_date) && (" + factFieldScriptMapping + "<="
            + "order_submit_date" + "+" + Long.parseLong(values.get(0)) * 86400000 + ")";
    ||||||| ORIGINAL (2386,2)
        return "(" + factFieldScriptMapping + "<=" + "order_submit_date ) && (" + Long.parseLong(values.get(0)) * 86400000
            + "+" + factFieldScriptMapping + ">=" + "order_submit_date)";
    =======
        if (Long.parseLong(values.get(0)) == 0) {
          return "(new Date(" + factFieldScriptMapping + ").getDay()" + "=="
              + "new Date(order_submit_date).getDay()) && ((" + factFieldScriptMapping + "-" + "order_submit_date"
              + ").abs()" + "<" + "86400000)";
        } else {
          return "(" + factFieldScriptMapping + ">" + "order_submit_date) && (" + factFieldScriptMapping + "<"
              + "order_submit_date" + "+" + Long.parseLong(values.get(0)) * 86400000 + ")";
        }
    >>>>>>> THEIRS (select with 'tc') (2396,8)
      }
@Override
Select: (p) postpone, (df) diff-full, (e) edit, (r) resolved,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: 

选择：（p）推迟，（df）差异完全，（e）编辑，（r）已解决，
（mc）地雷冲突，（tc）他们的冲突，
（s） 显示所有选项：dc
@@
}
}//条件的循环结束
>他们的（用“tc”选择）（1575,6）
}否则{
if（rule！=null&&rule.isTriggerApprovalsOnValuesChange（））{
ifScriptForPrimitiveFactFields=“（！idToObjMap | | hasChanged）”；
@@
如果（verDataMap！=null）{
idField=verDataMap.get（“ID_字段”）；
}
>他们的（用“tc”选择）（2334,3）
返回版本条件；
}
@@
Date addedDate=businessCalendar.add（提交日期，持续时间）；
long durationSecs=addedDate.getTime（）-submitDate.getTime（）；
>>>>他们的（用“tc”选择）（2351,9）
}
私有字符串在提交给Approvals的X工作日内（列表值、字符串factFieldScriptMapping）{
@@
+“订单提交日期”+“+”+工期秒+”；
返回表达式；
}
>>>他们的（用“tc”选择）（2382,0）
}
私有字符串包含XhoursofSubmitForApprovals（列表值、字符串factFieldScriptMapping）{
>>>>他们的（用“tc”选择）（2385,8）
}
私有字符串为inxDayOfSubmitForApprovals（列表值、字符串factFieldScriptMapping）{
>>>>他们的（用“tc”选择）（2396,8）
}
@凌驾
选择：（p）推迟，（df）差异完全，（e）编辑，（r）已解决，
（mc）地雷冲突，（tc）他们的冲突，
（s） 显示所有选项：

这里，我遇到的第一个冲突（1571,3）我需要做一个mc（我的冲突）来保留原始代码并删除我的更改，其余的我使用tc（他们的冲突）来保留我的更改并删除原始代码。 但我只能在终端中输入一个选项

---

您能帮我弄清楚如何对同一个文件进行多次更改，但有不同的冲突。

您基本上有两种选择：

• 使用“e”（编辑）：在这种情况下，编辑器将打开有问题的文件，并包括您在

  dc

  的输出中看到的所有冲突标记。然后您可以搜索