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.
I've always thought this is by-design, but, although I know that people smarter and more experienced than me have decided this way, I'm still not convinced that merging the second commit after the first one isn't what one would usually want... (of course when _inserting_ blocks, no removals involved) Flávio > Jeff Urlwin wrote: > > > to the tool, as the line numbers would be the same. Maybe > it should be a > > special case when the changes are after the last line > number on the previous > > rev...??? > > It is a conflict - no special case is required. > > If you have both modified the file at the same point (end,top,middle, > whatvever...) then CVS has no business ignoring that - it > *must* flag a > conflict. In the end case how is it to know which one goes > first? The > first edit or the last one? What if putting both in at the same time > would break the syntax of the file? These are things that > only a human > can decide. > > Tony