PH50474: "DISCARD CHANGES" ERROR WHILE RESOLVING MERGE CONFLICTS FOR TESTSUITE FILES DURING BRANCH MERGE WITH EGIT

APAR status

• Closed as program error.

Error description

• This problem is seen with a use-case where all Git operations
  are performed using Egit within RPT.
  
  If a branch and its merge target have changes in the same
  testsuite file, a conflict will arise while merging them. The
  only way to "resolve" this would be to pick one version between
  the two: either the version on the branch being merged or the
  version on the target branch. Egit provides a handy way to do
  this via a context menu from the staging view with option:
  Replace With > Ours or Theirs.
  
  However, an attempt to do this fails: 'An internal error
  occurred during: "Discard Changes"', and the conflict remains
  unresolved. The following stack trace is logged:
  
  org.eclipse.jgit.api.errors.JGitInternalException: Checkout
  conflict with file: MyProj/myTest.testsuite
      at
  org.eclipse.jgit.api.CheckoutCommand.checkoutPath(CheckoutComman
  d.java:528)
      ...
  

Local fix

Problem summary

• ****************************************************************
  * USERS AFFECTED:                                              *
  * RPT Users                                                    *
  ****************************************************************
  * PROBLEM DESCRIPTION:                                         *
  * See Error Description                                        *
  ****************************************************************
  * RECOMMENDATION:                                              *
  ****************************************************************
  

Problem conclusion

• Fixed
  

Temporary fix

Comments

APAR Information

• APAR is sysrouted FROM one or more of the following:

• APAR is sysrouted TO one or more of the following:

Fix information

• Fixed component name

  PERF TESTER WIN

• Fixed component ID

  5724J9601

Applicable component levels