Topic: CVS的问题

  Print this page

1.CVS的问题 Copy to clipboard
Posted by: gaoxt1983
Posted on: 2006-07-03 15:32

如果我在修改一个文件的时候(该文件已经update),这时候另一个同事改变了这个文件,但是我并没有再次update就commit了,这个时候哪个同事的修改会不会丢失?怎么防止这种事情的发生?

2.Re:CVS的问题 [Re: gaoxt1983] Copy to clipboard
Posted by: zcjl
Posted on: 2006-07-03 15:59

不会,这种情况下,会提示你仓库的文件在你最后一次update后已经更新,需要进行merge才能继续提交

3.Re:CVS的问题 [Re: gaoxt1983] Copy to clipboard
Posted by: Jcat
Posted on: 2006-07-08 18:09

IntelliJ can merge the diff automatically when the case is somehow simple.
Otherwise, you must merge it manually.


   Powered by Jute Powerful Forum® Version Jute 1.5.6 Ent
Copyright © 2002-2021 Cjsdn Team. All Righits Reserved. 闽ICP备05005120号-1
客服电话 18559299278    客服信箱 714923@qq.com    客服QQ 714923