Is there a simple way to remove the conflict icon in the gui window
without commiting the file back or getting a clean copy and
reapplying the local changes. I would like to edit the conflicting
file to remove the actual conflict, but then carry on working on
the local sandbox copy. Removing the conflict icon would make it
easier when I next do another update from the server to see which
files really have conflicts and are not just left overs from the last
time round.
Roger
------------------------ Yahoo! Groups Sponsor ---------------------~-->
Get 128 Bit SSL Encryption!
http://us.click.yahoo.com/CBxunD/vN2EAA/xGHJAA/z3wwlB/TM
---------------------------------------------------------------------~->
To unsubscribe from this group, send an email to:
cvsgui-unsubscribe@xxxxxxxxxxx
Your use of Yahoo! Groups is subject to http://docs.yahoo.com/info/terms/
|
