[
https://issues.apache.org/jira/browse/TRAFODION-2835?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16284368#comment-16284368
]
ASF GitHub Bot commented on TRAFODION-2835:
-------------------------------------------
GitHub user DaveBirdsall opened a pull request:
https://github.com/apache/incubator-trafodion/pull/1331
[TRAFODION-2835] Add script to aid in merge conflict resolution
Very often a conflict occurs because a test has been updated in two
branches, and that test has output containing DDL timestamps or plan IDs or
other unimportant information that varies on every regress run. When these are
the only differences, the conflict resolution is simple: Delete all the HEAD
stuff and accept all the new stuff. This script does exactly that.
The script looks for lines of the following form:
<<<<<<< HEAD
-- Definition current Wed Nov 29 08:53:46 2017
=======
-- Definition current Wed Dec 6 19:32:34 2017
>>>>>>> b149874... [TRAFODION-2827] Turn update costing code on by default
When it finds this, it removes the lines from <<<<<< HEAD to ======, and
removes the final >>>>>> line, leaving just:
-- Definition current Wed Dec 6 19:32:34 2017
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/DaveBirdsall/incubator-trafodion Trafodion2835
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/incubator-trafodion/pull/1331.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #1331
----
commit 69e15743d797b62dab7c447aea069facba26e45b
Author: Dave Birdsall <dbirds...@apache.org>
Date: 2017-12-08T22:55:48Z
[TRAFODION-2835] Add script to aid in merge conflict resolution
----
> 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)
