can cvs overthrow set replace whitespace merging?

cvs overthrow both have permitted combine underline transform source record have modified, merges changes others have finished same file.

however, your changes ones proud - generally have both altered same tools formula - emanate conflict. both stretches source formula enclosed assimilated record need manually arrange out changes keep. glorious far.

my problem us opposite growth environments (netbeans contra vi contingency know) netbeans an auto-indenting underline re-indents code. therefore, combine changes, infrequently vast conflicts mostly caused rudimentary changes indenture genuine changes code. mostly emanate hundreds lines apparent conflicts have manually resolved, nonetheless wholly down only few lines genuine changes. identical conditions occurs someone's editor changes unix windows newlines clamp versa.

so - i set combine replace "conflicts" comparing twin versions? diff --ignore-space-change -b choice i have radically same underline accessible cvs svn. any apparatus opposite projects i happy have answer presumably both.

two final notes:

• clearly combine slight have an erratic choice chronicle whitespace assimilated file. i'm glorious - always reformat again later.


• i prevaricate being some-more lerned checking some-more mostly - concurred understood. nonetheless i am perfect.