Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DEV-2648: Merge kepler to develop #1105

Closed
wants to merge 3 commits into from
Closed

DEV-2648: Merge kepler to develop #1105

wants to merge 3 commits into from

Conversation

kulgan
Copy link
Contributor

@kulgan kulgan commented May 2, 2024

Description

Merge kepler release (2.13.0) into master

Checklist

  • Added proper unit tests
  • Left proper TODO messages for any remaining tasks
  • Scanned for web accessibility with aXe, and mitigated or documented
    flagged issues

craigrbarnes
craigrbarnes requested changes May 3, 2024
View reviewed changes
Copy link
Contributor

@craigrbarnes craigrbarnes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are a number of merge conflicts.

@craigrbarnes
Copy link
Contributor

There are 3 commits to release/kepler this PR wants to merge:
However:

  1. The code for PEAR-1988 is already in develop.
  2. The reversion is the cause of the merge conflicts, and I am concerned it looks like it wants to remove and revert a number of changes to develop that it should not.
  3. Therefore the only useful commit is STJUDE's.

I recommend closing this PR, and I can open a new one on develop to update proteinpaint. @philtom-ctds, what do you think?

@craigrbarnes
Copy link
Contributor

opened PR for updating PP to 2.55.0: #1112

@craigrbarnes
Copy link
Contributor

Since #1112 has been merged, this PR can be closed without merging.

@craigrbarnes
Copy link
Contributor

Closing this PR as changes have already been merged.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@craigrbarnes craigrbarnes craigrbarnes requested changes

Assignees
No one assigned
Labels
Don't Merge
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@kulgan @craigrbarnes @siosonel @amlehman