Started 2 mo 13 days ago
Took 27 min

Success Build #594 (Apr 7, 2021, 7:06:02 PM)

Changes
  1. Staging view: display conflict state information (details)
  2. Handle modify-delete conflicts in "Replace With->Ours/Theirs" (details)
  3. Add "Replace With->Ours/Theirs" sub-menus for IFiles (details)
  4. Simplify labels for "Replace With->Ours/Theirs" (details)
  5. Unify determining the "theirs" commit (details)

Triggered by Gerrit: https://git.eclipse.org/r/c/egit/egit/+/178810

Revision: b81f80ae456cbebfc11025e8d633eb8a1d775b80
  • v0.0.6
Revision: 9904d5ba9d7d6b024a73999b5c9b19472a266205
  • origin/master
Test Result (no failures)
    FindBugs: 85 warnings from one analysis.
      Duplicate Code: 35 warnings from one analysis.