优化操作冲突标题

Author: zetaloop

app/src/ui/multi-commit-operation/base-multi-commit-operation.tsx

@@ -205,7 +205,7 @@ export abstract class BaseMultiCommitOperation extends React.Component<IMultiCom
             ourBranch={ourBranch}
             theirBranch={theirBranch}
             manualResolutions={manualResolutions}
-            headerTitle={`进行${operationDetail.kind}前请先解决冲突`}
+            headerTitle={`请先解决冲突后继续${operationDetail.kind}`}
             submitButton={submit}
             abortButton={abort}
             onSubmit={this.onContinueAfterConflicts}