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.

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

233: Merge bot should be able to multiple branches #365

Closed
wants to merge 1 commit into from

Conversation

edvbld
Copy link
Member

@edvbld edvbld commented Jan 20, 2020

Hi all,

please review this patch that makes the merge bot being able to merge multiple
branches for a single target repository. For example, the merge bot can now be
set up to merge e.g. jdk:master into the target's master branch and then
merge the target's master branch into the target's dev branch. Merge
conflict pull request "alerts" are created per merge specification (from repo,
from branch, target branch).

Thanks,
Erik

Testing

  • Updated existing unit tests

Progress

  • Change must not contain extraneous whitespace
  • Change must be properly reviewed

Issue

SKARA-233: Merge bot should be able to multiple branches

Approvers

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Jan 20, 2020

👋 Welcome back ehelin! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request (refresh this page to view it).

@mlbridge
Copy link

@mlbridge mlbridge bot commented Jan 20, 2020

Webrevs

Copy link
Member

@rwestberg rwestberg left a comment

Looks good!

@openjdk openjdk bot removed the rfr label Jan 20, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Jan 20, 2020

@edvbld This change now passes all automated pre-integration checks. When the change also fulfills all project specific requirements, type /integrate in a new comment to proceed. After integration, the commit message will be:

233: Merge bot should be able to multiple branches

Reviewed-by: rwestberg
  • If you would like to add a summary, use the /summary command.
  • To credit additional contributors, use the /contributor command.
  • To add additional solved issues, use the /solves command.

➡️ To integrate this PR with the above commit message, type /integrate in a new comment.

@openjdk openjdk bot added the ready label Jan 20, 2020
@edvbld
Copy link
Member Author

@edvbld edvbld commented Jan 20, 2020

/integrate

@openjdk openjdk bot closed this Jan 20, 2020
@openjdk openjdk bot added integrated and removed ready labels Jan 20, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Jan 20, 2020

@edvbld
Pushed as commit 326e4d3.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Jan 20, 2020

Mailing list message from Erik Helin on skara-dev:

Changeset: 326e4d3
Author: Erik Helin <ehelin at openjdk.org>
Date: 2020-01-20 07:51:02 +0000
URL: https://git.openjdk.java.net/skara/commit/326e4d3d

233: Merge bot should be able to multiple branches

Reviewed-by: rwestberg

! bots/merge/src/main/java/org/openjdk/skara/bots/merge/MergeBot.java
! bots/merge/src/main/java/org/openjdk/skara/bots/merge/MergeBotFactory.java
! bots/merge/src/test/java/org/openjdk/skara/bots/merge/MergeBotTests.java

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