<html>
<head>
<meta content="text/html; charset=ISO-8859-1"
http-equiv="Content-Type">
</head>
<body text="#000000" bgcolor="#FFFFFF">
<div class="moz-cite-prefix">On 8/2/2013 6:56 AM, Gijs Kruitbosch
wrote:<br>
</div>
<blockquote cite="mid:51FBBA82.5000401@gmail.com" type="cite">
<meta content="text/html; charset=ISO-8859-1"
http-equiv="Content-Type">
<div class="moz-cite-prefix">And can I add something to that... We
just had some sheriffs in #fx-team on IRC who asked for help
with some conflicts in merging m-c (which had just had inbound
merged in) to fx-team.<br>
<br>
When doing the merge, I noticed that some people (who shall
remain nameless to protect the guilty) had pushed to both
fx-team and m-i within ~1 day of each other, with conflicting
patches.<br>
</div>
</blockquote>
In case this was the Metro team (I'm not certain it was), I'm sorry
-- we just made the switch from inbound to fx-team yesterday, so we
may well have had patches outstanding on inbound at the time. We
probably should have checked whether there were any pending merges
that might lead to conflicts.<br>
</body>
</html>