[TRAFODION-2835] Script to help resolve merge conflicts particularly in regression test results

• Type: New Feature
• Status: Closed
• Priority: Minor
• Resolution: Implemented
• Affects Version/s: any
• Fix Version/s: 2.3
• Component/s: dev-environment
• Assignee: Dave Birdsall
• Reporter: Dave Birdsall
• Created: 08/Dec/17 22:45
• Updated: 13/Aug/18 21:11
• Resolved: 12/Dec/17 01:30

Description

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.

Issue Links

• links to: GitHub Pull Request #1331