<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8">
</head>
<body smarttemplateinserted="true" bgcolor="#FFFFFF" text="#000000">
Hello all,<br>
<br>
<br>
For everyone that is contributing to Rudder, we now have a new tool
to merge pull requests.<br>
We always had a principle: fix bug on oldest supported version
first. This lead to pull requests based on this oldest version.<br>
<br>
Then we have to merge those fixes to more recent versions. This was
done by a merge bot and when the bot couldn't easily merge the
commits, it just sent us a mail to tell us that we had to fix this
by ourselves.<br>
This was error prone since we didn't always merge a single PR but
sometimes many. And it was not always the author or the reviewer of
the PR who did the merge.<br>
<br>
To avoid those problems we now have a new bot. This one knows
github.<br>
<br>
Now when a reviewer agrees on a pull request, he just set the flag
"Ready for merge", the bot will see this flag and try to merge the
pr and merge to upper versions. If it works, a real merge is done
and there is nothing else to do and everyone is happy.<br>
<br>
If there is a merge difficulty, the bot instead asks for a manual
merge, and gives the command to do to it. Moreover, it adds a new
flag "qa: can't merge" to make sure it doesn't continuously retry
something that it cannot do. Then all you just have to do is run the
given command. If you don't have merge rights on the repository, the
reviewer will do it for you.<br>
And if we detect that there was a bug, we can remove the "qa: can't
merge" flag and the bot will happily retry the merge.<br>
<br>
<br>
All in all, those colorful flags will help us achieve a higher
quality level.<br>
<br>
<div class="moz-signature">-- <br>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
<style type="text/css">
<!--
a.redlink:link { color: #1782E6; }
a.redlink:visited { color: #1782E6; }
.sig { font-family: 'Century Gothic', CenturyGothic, AppleGothic, sans-serif; font-size: small; }
.sigsmall { font-family: 'Century Gothic', CenturyGothic, AppleGothic, sans-serif; font-size: x-small; }
-->
</style>
<table border="0" width="380" cellpadding="0" cellspacing="2">
<tbody>
<tr>
<td colspan="2">
<hr></td>
</tr>
<tr>
<td colspan="2"><b><img alt="Logo Normation"
src="cid:part1.01060806.01040109@normation.com"
align="left" height="50" hspace="10" width="50"> <span
class="sig">Benoît Peccatte</span></b><br>
<span class="sig"><i>Responsable cloud development</i></span><br>
<span class="sig"><a class="redlink"
href="http://www.normation.com">Normation</a></span> </td>
</tr>
<tr>
<td colspan="2">
<hr></td>
</tr>
<tr>
<td colspan="2"><span class="sigsmall"><b>87, Rue de
Turbigo, 75003 Paris, France</b></span></td>
</tr>
<tr>
<td><span class="sigsmall">Phone:</span></td>
<td><span class="sigsmall">+33 (0)1 85 08 48 96</span></td>
</tr>
<tr>
<td colspan="2">
<hr> </td>
</tr>
</tbody>
</table>
</div>
<span class="st4cursor"></span>
</body>
</html>