RFR: 941: Warn about required merge after dependent PR integration
rwestberg at openjdk.java.net
Thu Apr 22 13:38:50 UTC 2021
On Thu, 22 Apr 2021 13:33:55 GMT, Robin Westberg <rwestberg at openjdk.org> wrote:
> When a dependent PR has been integrated, post an instructional message on how to merge these changes.
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"
More information about the skara-dev