📄 ch03s22.html

📁 linux 下的图形化的 SVN 相当于 VSS
💻 HTML
字号:
<html>   <head>      <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">         <title>Resolving Conflicts</title>      <link rel="stylesheet" href="corpstyle.css" type="text/css">      <meta name="generator" content="DocBook XSL Stylesheets V1.65.1">      <link rel="home" href="index.html" title="The eSvn User Manual">      <link rel="up" href="ch03.html" title="Chapter&nbsp;3.&nbsp;Using eSvn">      <link rel="previous" href="ch03s21.html" title="Cleaning up">      <link rel="next" href="ch03s23.html" title="Editing">   </head>   <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">      <div class="navheader">         <table width="100%" summary="Navigation header">            <tr>               <th colspan="3" align="center">Resolving Conflicts</th>            </tr>            <tr>               <td width="20%" align="left"><a accesskey="p" href="ch03s21.html"><img src="common/navig/prev.gif" alt="Prev"></a>&nbsp;               </td>               <th width="60%" align="center">Chapter&nbsp;3.&nbsp;Using eSvn</th>               <td width="20%" align="right">&nbsp;<a accesskey="n" href="ch03s23.html"><img src="common/navig/next.gif" alt="Next"></a></td>            </tr>         </table>         <hr>      </div>      <div class="sect1" lang="en">         <div class="titlepage">            <div>               <div>                  <h2 class="title" style="clear: both"><a name="esvn-resolve"></a>Resolving Conflicts                  </h2>               </div>            </div>            <div></div>         </div>         <p>Remember to use this option after resolving a 'conflict' state (see                      <a href="ch03s30.html" title="Diff-3 (conflict)">the section called &#8220;Diff-3 (conflict)&#8221;</a>).         </p>      </div>      <div class="navfooter">         <hr>         <table width="100%" summary="Navigation footer">            <tr>               <td width="40%" align="left"><a accesskey="p" href="ch03s21.html"><img src="common/navig/prev.gif" alt="Prev"></a>&nbsp;               </td>               <td width="20%" align="center"><a accesskey="u" href="ch03.html"><img src="common/navig/up.gif" alt="Up"></a></td>               <td width="40%" align="right">&nbsp;<a accesskey="n" href="ch03s23.html"><img src="common/navig/next.gif" alt="Next"></a></td>            </tr>            <tr>               <td width="40%" align="left" valign="top">Cleaning up&nbsp;</td>               <td width="20%" align="center"><a accesskey="h" href="index.html"><img src="common/navig/home.gif" alt="Home"></a></td>               <td width="40%" align="right" valign="top">&nbsp;Editing</td>            </tr>         </table>      </div>   </body></html>
⌨️ 快捷键说明

复制代码 Ctrl + C
搜索代码 Ctrl + F
全屏模式 F11
切换主题 Ctrl + Shift + D
显示快捷键 ?
增大字号 Ctrl + =
减小字号 Ctrl + -