[
https://issues.apache.org/jira/browse/TRAFODION-2835?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16284363#comment-16284363
]
Steve Varnau commented on TRAFODION-2835:
-----------------------------------------
As someone doing lots of merges, I agree this is a pain.
I wonder why we don't checkin the filtered versions of these files so that the
diffs between commits would show only the relevant changes, not the
date-stamps, etc.
> Script to help resolve merge conflicts particularly in regression test results
> ------------------------------------------------------------------------------
>
> Key: TRAFODION-2835
> URL: https://issues.apache.org/jira/browse/TRAFODION-2835
> Project: Apache Trafodion
> Issue Type: New Feature
> Components: dev-environment
> Affects Versions: any
> Reporter: David Wayne Birdsall
> Assignee: David Wayne Birdsall
> Priority: Minor
>
> Frequently when merging changes between branches, one has to confront the
> merging of regression test result files. These files often are loaded with
> incidental information such as timestamps on DDL definitions or identifiers
> associated with plans or object UIDs and so on, information that varies on
> each test run. When a test has been modified on both branches, this
> incidental information inevitably shows up as merge conflicts. In this case
> it does not matter which we pick in the merged result though for
> consistency's sake it is best to choose that from just one or the other
> branch.
> A script that edits a merged file removing the HEAD part of the conflict
> would speed this tedious work up greatly in some cases.
--
This message was sent by Atlassian JIRA
(v6.4.14#64029)
