svn提交失败

1.我看到是这样的

 <!-- 指标接口-->
 <bean name="budgetPortDao" class="com.mofit.budget.budgetPort.dao.budgetPortDao" />
 <bean name="budgetPortService" class="com.mofit.budget.budgetPort.service.budgetPortService">
  <property name="budgetPortDao" ref="budgetPortDao"></property>
 </bean>
 
 <!-- 指标调整-->
 <bean name="budgetAdjustDao" class="com.mofit.budget.budgetAdjust.dao.budgetAdjustDao" />
 <bean name="budgetAdjustService" class="com.mofit.budget.budgetAdjust.service.budgetAdjustService">
  <property name="budgetAdjustDao" ref="budgetAdjustDao"></property>
 </bean>
 

 

2.我写了之后的

 <!-- 指标接口-->
 <bean name="budgetPortDao" class="com.mofit.budget.budgetPort.dao.budgetPortDao" />
 <bean name="budgetPortService" class="com.mofit.budget.budgetPort.service.budgetPortService">
  <property name="budgetPortDao" ref="budgetPortDao"></property>
 </bean>
 
 <!-- 指标调整-->
 <bean name="budgetAdjustDao" class="com.mofit.budget.budgetAdjust.dao.budgetAdjustDao" />
 <bean name="budgetAdjustService" class="com.mofit.budget.budgetAdjust.service.budgetAdjustService">
  <property name="budgetAdjustDao" ref="budgetAdjustDao"></property>
 </bean>
 
 <!-- 指标下达-->
 <bean name="budgetUsedDao" class="com.mofit.budget.budgetUsed.dao.budgetUsedDao" />
 <bean name="budgetUsedService" class="com.mofit.budget.budgetUsed.service.budgetUsedService">
  <property name="bdao" ref="budgetUsedDao"></property>
 </bean>
 

 

3.我还没提交，别人先提交了

 <!-- 指标接口-->
 <bean name="budgetPortDao" class="com.mofit.budget.budgetPort.dao.budgetPortDao" />
 <bean name="budgetPortService" class="com.mofit.budget.budgetPort.service.budgetPortService">
  <property name="budgetPortDao" ref="budgetPortDao"></property>
 </bean>
 
 <!-- 指标调整-->
 <bean name="budgetAdjustDao" class="com.mofit.budget.budgetAdjust.dao.budgetAdjustDao" />
 <bean name="budgetAdjustService" class="com.mofit.budget.budgetAdjust.service.budgetAdjustService">
  <property name="budgetAdjustDao" ref="budgetAdjustDao"></property>
 </bean>
 
 <!-- 指标录入-->
 <bean name="budgetInsertDao" class="com.mofit.budget.budgetInsert.dao.budgetInsertDao" />
 <bean name="budgetInsertService" class="com.mofit.budget.budgetInsert.service.budgetInsertService">
  <property name="budgetInsertDao" ref="budgetInsertDao"></property>
 </bean>
 

4.冲突

 <!-- 指标接口-->
 <bean name="budgetPortDao" class="com.mofit.budget.budgetPort.dao.budgetPortDao" />
 <bean name="budgetPortService" class="com.mofit.budget.budgetPort.service.budgetPortService">
  <property name="budgetPortDao" ref="budgetPortDao"></property>
 </bean>
 
 <!-- 指标调整-->
 <bean name="budgetAdjustDao" class="com.mofit.budget.budgetAdjust.dao.budgetAdjustDao" />
 <bean name="budgetAdjustService" class="com.mofit.budget.budgetAdjust.service.budgetAdjustService">
  <property name="budgetAdjustDao" ref="budgetAdjustDao"></property>
 </bean>
 
<<<<<<< .mine
 <!-- 指标下达-->
 <bean name="budgetUsedDao" class="com.mofit.budget.budgetUsed.dao.budgetUsedDao" />
 <bean name="budgetUsedService" class="com.mofit.budget.budgetUsed.service.budgetUsedService">
  <property name="bdao" ref="budgetUsedDao"></property>
 </bean>
 
=======
 <!-- 指标录入-->
 <bean name="budgetInsertDao" class="com.mofit.budget.budgetInsert.dao.budgetInsertDao" />
 <bean name="budgetInsertService" class="com.mofit.budget.budgetInsert.service.budgetInsertService">
  <property name="budgetInsertDao" ref="budgetInsertDao"></property>
 </bean>
 
>>>>>>> .r40269