we don't often get file conflicts but we are working on each others' work more commonly now. we were sitting about, wondering about the Flare topic window size parameters eg
Code: Select all
<html xmlns:MadCap="http://www.madcapsoftware.com/Schemas/MadCap.xsd" xml:lang="en-us" MadCap:lastBlockDepth="8" MadCap:lastHeight="2542" MadCap:lastWidth="1809">
this is the kind of conflict that shouldn't need a human to resolve...
so my question is, has anyone bumped into this, and do you know if we can somehow prevent this line from conflicting?
my thoughts so far, without any real testing:
- can you turn off the feature that remembers these window size params for next time, thus removing them from source on all files?
if not, is there a way, perhaps svn:ignore property (is there a really granular equivalent of this?)to tell the svn client not to notice these lines?
does the flare+svn integration somehow work around these kinds of issues?
owen
(using win7, Flare 9, moving to 10 soonish, svn 1.7.x, tortoisesvn and sliksvn)