<!DOCTYPE html><html><head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
</head>
<body>
<p>If you are a member of any of the projects listed below, you may
have received an invite today to join a repository in the
'openjdk-bots' organization on GitHub. If you aren't involved in
resolving merge conflicts for automatic merges in any of these
projects, you may ignore the invite and stop reading now.<br>
</p>
<ul>
<li>amber</li>
<li>mobile<br>
</li>
<li>panama</li>
<li>skara (not actually using automatic merges, this project was
used for testing the auto invite functionality)<br>
</li>
</ul>
<p>These projects are all using a Skara service to automatically
perform merges of upstream JDK changes into one or more branches
in their project repositories. Sometimes the bot will encounter a
conflict in such a merge, which will require manual intervention
by someone in the project. To handle this, the bot creates a pull
request with instructions on how to resolve the merge conflict
(e.g. [1]). Similar to when using the /backport command, this pull
request is created from a special fork of the parent project in
the 'openjdk-bots' organization. When using the /backport command,
the issuer of the command is dynamically granted write access in
the relevant branch of that fork. However, in the case of merge
conflict pull requests, any project member of role committer or
higher should be able to help resolve the merge conflict. Until
now we were handling permissions in these project forks manually,
but today I deployed automation adding write access for all
project members of role committer or higher, which is why there
was a sudden influx of invites going out.</p>
<p>If you are interested in resolving merge conflicts for these
automatic merges in the future, I recommend accepting the invites.</p>
<p>If you would like to enable automatic merging from upstream, or
between branches, in any other project, feel free to contact us.<br>
</p>
<p>/Erik<br>
</p>
<p>[1] <a class="moz-txt-link-freetext" href="https://github.com/openjdk/mobile/pull/21">https://github.com/openjdk/mobile/pull/21</a><br>
</p>
</body>
</html>