1.原始的xml(当中topbar对应的xml布局有问题,所有按钮都挤在一行了,现在要把这个topbar对应的xml设计成两行的,现在我对这个xml进行bug修改)
<?xml version="1.0" encoding="UTF-8" ?>
<freeform>
<Properties>
<backGround bgColor="#E5EAFF,#FAFFFF" />
</Properties>
<Fonts ref="../../../font.xml" />
<Objects>
<TableLayout id="layout1" x="0" y="0" width="100%" height="100%"
border="1">
<col width="20%" />
<col width="2" />
<col width="0.10" />
<tr height="100%">
<td>
<TableLayout id="layout1_1" x="0" y="0" width="100%"
height="100%" border="1">
<col width="100%" />
<tr height="28">
<td>
<Component id="titlebar" Type="freeform" CreatePara="border=none"
URL="itemAudit_titlebarPeo.xml" />
</td>
</tr>
<tr height="0.10">
<td>
<Component id="dept_tree" width="100%" Type="Tree"
CreatePara="border=none;Style=hasButton,hasline,showSelAlways" />
</td>
</tr>
</TableLayout>
</td>
<td>
<Rect id="rect1" height="1" color="#C0C0FF" thick="3"
isDragBar="1" />
</td>
<td>
<TableLayout id="layout1_2" x="0" y="0" width="100%"
height="100%" border="1">
<col width="100%" />
<tr height="28">
<td>
<Component id="topbar2" width="3" Type="freeform"
CreatePara="border=none" URL="itemTzSubmitDataList_topbarPeo2.xml" />
</td>
</tr>
<tr height="28">
<td>
<Component id="topbar" width="3" Type="freeform"
CreatePara="border=none" URL="itemTzSubmitDataList_topbarPeo.xml" />
</td>
</tr>
<tr height="28">
<td>
<Component id="bgtItemInfoQuery" Type="freeform"
CreatePara="border=none" URL="itemFundsListQuery.xml" />
</td>
</tr>
<tr height="0.10">
<td>
<!-- <Component id="itemlist" Type="treelist" CreatePara="border=none;"
URL="itemTzSubmitListPeo.xml" /> -->
<Component width='1' height="2" id="itemlist" Type="Treelist" CreatePara="border=none;" URL="itemTzSubmitListPeo.xml"/>
</td>
</tr>
</TableLayout>
</td>
</tr>
</TableLayout>
</Objects>
</freeform>
2.我修改之后的
<?xml version="1.0" encoding="UTF-8" ?>
<freeform>
<Properties>
<backGround bgColor="#E5EAFF,#FAFFFF" />
</Properties>
<Fonts ref="../../../font.xml" />
<Objects>
<TableLayout id="layout1" x="0" y="0" width="100%" height="100%"
border="1">
<col width="20%" />
<col width="2" />
<col width="0.10" />
<tr height="100%">
<td>
<TableLayout id="layout1_1" x="0" y="0" width="100%"
height="100%" border="1">
<col width="100%" />
<tr height="28">
<td>
<Component id="titlebar" Type="freeform" CreatePara="border=none"
URL="itemAudit_titlebarPeo.xml" />
</td>
</tr>
<tr height="0.10">
<td>
<Component id="dept_tree" width="100%" Type="Tree"
CreatePara="border=none;Style=hasButton,hasline,showSelAlways" />
</td>
</tr>
</TableLayout>
</td>
<td>
<Rect id="rect1" height="1" color="#C0C0FF" thick="3"
isDragBar="1" />
</td>
<td>
<TableLayout id="layout1_2" x="0" y="0" width="100%"
height="100%" border="1">
<col width="100%" />
<tr height="28">
<td>
<Component id="topbar2" width="3" Type="freeform"
CreatePara="border=none" URL="itemTzSubmitDataList_topbarPeo2.xml" />
</td>
</tr>
<tr height="28">
<td><注意:这个td里面的内容我修改过了>
<!-- <Component id="topbar" width="3" Type="freeform"
CreatePara="border=none" URL="itemTzSubmitDataList_topbarPeo.xml" /> -->
<Component id="topbar" width="3" Type="freeform"
CreatePara="border=none" URL="aaa.xml" />
</td>
</tr>
<tr height="28">
<td>
<Component id="bgtItemInfoQuery" Type="freeform"
CreatePara="border=none" URL="itemFundsListQuery.xml" />
</td>
</tr>
<tr height="0.10">
<td>
<!-- <Component id="itemlist" Type="treelist" CreatePara="border=none;"
URL="itemTzSubmitListPeo.xml" /> -->
<Component width='1' height="2" id="itemlist" Type="Treelist" CreatePara="border=none;" URL="itemTzSubmitListPeo.xml"/>
</td>
</tr>
</TableLayout>
</td>
</tr>
</TableLayout>
</Objects>
</freeform>
3.这是别人在本地提交的时候的样子
<?xml version="1.0" encoding="UTF-8" ?>
<freeform>
<Properties>
<backGround bgColor="#E5EAFF,#FAFFFF" />
</Properties>
<Fonts ref="../../../font.xml" />
<Objects>
<TableLayout id="layout1" x="0" y="0" width="100%" height="100%"
border="1">
<col width="20%" />
<col width="2" />
<col width="0.10" />
<tr height="100%">
<td>
<TableLayout id="layout1_1" x="0" y="0" width="100%"
height="100%" border="1">
<col width="100%" />
<tr height="28">
<td>
<Component id="titlebar" Type="freeform" CreatePara="border=none"
URL="itemAudit_titlebarPeo.xml" />
</td>
</tr>
<tr height="0.10">
<td>
<Component id="dept_tree" width="100%" Type="Tree"
CreatePara="border=none;Style=hasButton,hasline,showSelAlways" />
</td>
</tr>
</TableLayout>
</td>
<td>
<Rect id="rect1" height="1" color="#C0C0FF" thick="3"
isDragBar="1" />
</td>
<td>
<TableLayout id="layout1_2" x="0" y="0" width="100%"
height="100%" border="1">
<col width="100%" />
<tr height="28">
注意:他在这里去掉了有个一对td,也就去掉了id=topbar2的内容。
<td>
<Component id="topbar" width="3" Type="freeform"
CreatePara="border=none" URL="itemTzSubmitDataList_topbarPeo.xml" />
</td>
</tr>
<tr height="28">
<td>
<Component id="bgtItemInfoQuery" Type="freeform"
CreatePara="border=none" URL="itemFundsListQuery.xml" />
</td>
</tr>
<tr height="0.10">
<td>
<!-- <Component id="itemlist" Type="treelist" CreatePara="border=none;"
URL="itemTzSubmitListPeo.xml" /> -->
<Component width='1' width="3" height="2" id="itemlist" Type="Treelist" CreatePara="border=none;" URL="itemTzSubmitListPeo.xml"/>
</td>
</tr>
</TableLayout>
</td>
</tr>
</TableLayout>
</Objects>
</freeform>
4.在svn上更新的时候出问题了,因为我修改此xml的时候,别人也在修改,并且他比我先提交了,导致我们之间的代码有冲突的部分。我提交失败
<?xml version="1.0" encoding="UTF-8" ?>
<freeform>
<Properties>
<backGround bgColor="#E5EAFF,#FAFFFF" />
</Properties>
<Fonts ref="../../../font.xml" />
<Objects>
<TableLayout id="layout1" x="0" y="0" width="100%" height="100%"
border="1">
<col width="20%" />
<col width="2" />
<col width="0.10" />
<tr height="100%">
<td>
<TableLayout id="layout1_1" x="0" y="0" width="100%"
height="100%" border="1">
<col width="100%" />
<tr height="28">
<td>
<Component id="titlebar" Type="freeform" CreatePara="border=none"
URL="itemAudit_titlebarPeo.xml" />
</td>
</tr>
<tr height="0.10">
<td>
<Component id="dept_tree" width="100%" Type="Tree"
CreatePara="border=none;Style=hasButton,hasline,showSelAlways" />
</td>
</tr>
</TableLayout>
</td>
<td>
<Rect id="rect1" height="1" color="#C0C0FF" thick="3"
isDragBar="1" />
</td>
<td>
<TableLayout id="layout1_2" x="0" y="0" width="100%"
height="100%" border="1">
<col width="100%" />
<tr height="60">
<td>
<<<<<<< .mine
<!-- <Component id="topbar" width="3" Type="freeform"
CreatePara="border=none" URL="itemTzSubmitDataList_topbarPeo.xml" /> -->
<Component id="topbar" width="3" Type="freeform"
CreatePara="border=none" URL="aaa.xml" />
=======
<Component id="topbar2" width="3" Type="freeform"
CreatePara="border=none" URL="itemTzSubmitDataList_topbarPeo2.xml" />
</td>
</tr>
<tr height="28">
<td>
<Component id="topbar" width="3" Type="freeform"
CreatePara="border=none" URL="itemTzSubmitDataList_topbarPeo.xml" />
>>>>>>> .r32255
</td>
</tr>
<tr height="28">
<td>
<Component id="bgtItemInfoQuery" Type="freeform"
CreatePara="border=none" URL="itemFundsListQuery.xml" />
</td>
</tr>
<tr height="0.10">
<td>
<!-- <Component id="itemlist" Type="treelist" CreatePara="border=none;"
URL="itemTzSubmitListPeo.xml" /> -->
<Component width='1' height="2" id="itemlist" Type="Treelist" CreatePara="border=none;" URL="itemTzSubmitListPeo.xml"/>
</td>
</tr>
</TableLayout>
</td>
</tr>
</TableLayout>
</Objects>
</freeform>
对4进行分析:
第一:下面这段表示冲突代码中关于我的部分
<<<<<<< .mine
<!-- <Component id="topbar" width="3" Type="freeform"
CreatePara="border=none" URL="itemTzSubmitDataList_topbarPeo.xml" /> -->
<Component id="topbar" width="3" Type="freeform"
CreatePara="border=none" URL="aaa.xml" />
=======
第二:下面这段表示冲突代码中关于他的部分(由于他已经提交成功了,所以这也就是服务器上的代码)
=======
<Component id="topbar2" width="3" Type="freeform"
CreatePara="border=none" URL="itemTzSubmitDataList_topbarPeo2.xml" />
</td>
</tr>
<tr height="28">
<td>
<Component id="topbar" width="3" Type="freeform"
CreatePara="border=none" URL="itemTzSubmitDataList_topbarPeo.xml" />
>>>>>>> .r32255
第三:我应该怎么做
1.删掉从<<<<<<< .mine到=======之间的代码(这是我自己的代码)
2.=======到>>>>>>> .r32255的代码是别人先提交的代码
3.删掉>>>>>>> .r32255,之后我就可以提交成功了。
结果:冲突部分的代码,是提交的别人代码。在冲突部分,我的代码没用上,被我自己删掉了