Uploaded image for project: 'IGB'
  1. IGB
  2. IGBF-3451

Clean up R6 commits, create pull request to main-JDK8

    Details

      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

            Activity

            Hide
            nfreese Nowlan Freese added a comment -

            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-3451 to 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

            Show
            nfreese Nowlan Freese added a comment - 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-3451 to 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
            Hide
            ann.loraine Ann Loraine added a comment -

            Variable colon and hyphen usage in the commit messages warms my heart

            Show
            ann.loraine Ann Loraine added a comment - Variable colon and hyphen usage in the commit messages warms my heart
            Hide
            ann.loraine Ann Loraine added a comment -

            Merged.

            Show
            ann.loraine Ann Loraine added a comment - Merged.
            Hide
            nfreese Nowlan Freese added a comment -

            Tested using main-JDK8.dmg installer on Mac. IGB installed and ran correctly.

            Closing ticket.

            Show
            nfreese Nowlan Freese added a comment - Tested using main-JDK8.dmg installer on Mac. IGB installed and ran correctly. Closing ticket.

              People

              • Assignee:
                nfreese Nowlan Freese
                Reporter:
                nfreese Nowlan Freese
              • Votes:
                0 Vote for this issue
                Watchers:
                2 Start watching this issue

                Dates

                • Created:
                  Updated:
                  Resolved: