Custom merge rules?

[keith204]

Consider this override file example:

Custom.xsl

<xsl:template name="bar">
</xsl:template>

Base Old.xsl

<xsl:template name="foo">
</xsl:template>

<xsl:template name="bar">
</xsl:template>

<xsl:template name="baz">
</xsl:template>

Base New.xsl

<xsl:template name="foo">
[COLOR="red"] <xsl:if test="/bogus/@val='hello'">
  <xsl:call-template name="dosomething"/>
 </xsl:if>[/COLOR]
</xsl:template>

<xsl:template name="bar">
</xsl:template>

<xsl:template name="baz">
</xsl:template>

Merged.xsl

[COLOR="red"]<!--BC recommends putting bogus IF statement here,
which I'd like to ignore since it's inside of a template that I haven't
overridden -->[/COLOR]

[COLOR="red"] <xsl:if test="/bogus/@val='hello'">
  <xsl:call-template name="dosomething"/>
 </xsl:if>[/COLOR]

<xsl:template name="bar">
</xsl:template>

Essentially, is there a way to specify something like:

IF (Template in NEW doesn't exist in CUSTOM)
* Ignore inner differences

[Aaron]

Hello,

In your example, that section would be marked as a Conflict, assuming the default session settings, Alignment tab, Left change and right change separated by lines option is enabled. We do not have the ability to determine syntax of inner bracket lines at this time, but we can mark sections like this as one large block.

Conflict sections are sections where both sides have been changed from the ancestor, and manual intervention is required.