Details
-
Type: Task
-
Status: Closed (View Workflow)
-
Priority: Major
-
Resolution: Done
-
Affects Version/s: None
-
Fix Version/s: 10.0.0 Major Release
-
Labels:None
-
Story Points:0.5
-
Epic Link:
-
Sprint:Fall 2 2023 Sep 17
Description
Situation: The R6 branch needs to be merged with main-JDK8. There are a few commits that were reverted and can be squashed, to clean up the commit history prior to merging.
Task: Clean up the R6 branch commits. Create pull request.
Attachments
Issue Links
- is blocked by
-
IGBF-3431 Update maven-bundle-plugin
- Closed
Commits on branch: https://bitbucket.org/nfreese/nowlanfork-igb/commits/branch/IGBF-3451
I dropped 8 commits total (4 commits that were then each reverted) from the main-JDK8-r6 branch. These commits may cause confusion later as they were eventually reimplemented in a separate commit once they were working. So dropping the initial commit and its reversion makes the commit history less confusing and would make it easier for us moving forward to correctly identify the commit that made the correct change.
I have then rebased the r6 changes onto main-JDK8 and tested through the installer. The pull request has been created from my branch,
IGBF-3451to main-JDK8, instead of from main-JDK8-r6 as the rebase on main-JDK8 would otherwise cause conflicts when merging to main-JDK-r6.Pull request: https://bitbucket.org/lorainelab/integrated-genome-browser/pull-requests/950