Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to sales@march-hare.com.
Gerhard Fiedler wrote: > I think what Tony Eva means is that this changed timestamp should change > the cvs status from "conflict" to "modified". This has some logic for it... > The full text from status is 'File had conflicts on merge' which is quite explicit in its meaning IMO. cvs has no way of knowing whether you've resolved the conflicts yet until you confirm that you have done so by committing your changes.. even if you have removed the markers you might not have finished (not that conflict markers are any indicication since they can appear legitimately albeit rarely). Tony