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
941: Warn about required merge after dependent PR integration #1134
Conversation
|
The message looks like: The dependent pull request has now been integrated, and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the target branch into this pull request by running commands similar to these in the local repository for your personal fork: git checkout source
git fetch file:///private/var/folders/d6/1lm60n2x37z35d9y72zl88k80000gn/T/RepositoryTests11763809428403690025/hosted.git master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push |
Webrevs
|
bots/notify/src/main/java/org/openjdk/skara/bots/notify/prbranch/PullRequestBranchNotifier.java
Outdated
Show resolved
Hide resolved
@rwestberg This change now passes all automated pre-integration checks. After integration, the commit message for the final commit will be:
You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed. At the time when this comment was updated there had been 1 new commit pushed to the
Please see this link for an up-to-date comparison between the source branch of this pull request and the
|
…ch/PullRequestBranchNotifier.java Co-authored-by: Erik Joelsson <37597443+erikj79@users.noreply.github.com>
@erikj79 Thanks for reviewing! |
@stefank As the original issue reporter, does this look reasonable to you? |
/integrate |
@rwestberg Since your change was applied there have been 3 commits pushed to the
Your commit was automatically rebased without conflicts. Pushed as commit f084dc2. |
When a dependent PR has been integrated, post an instructional message on how to merge these changes.
Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/skara pull/1134/head:pull/1134
$ git checkout pull/1134
Update a local copy of the PR:
$ git checkout pull/1134
$ git pull https://git.openjdk.java.net/skara pull/1134/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 1134
View PR using the GUI difftool:
$ git pr show -t 1134
Using diff file
Download this PR as a diff file:
https://git.openjdk.java.net/skara/pull/1134.diff