reminder: fx-team is the new (front-end) inbound
ehsan.akhgari at gmail.com
Fri Aug 2 15:54:28 UTC 2013
On 2013-08-02 11:17 AM, Matt Brubeck wrote:
> On 8/2/2013 6:56 AM, Gijs Kruitbosch wrote:
>> 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.
>> 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.
> 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.
Merge conflicts will definitely happen more in the future, I don't think
it's reasonable to expect everybody to have a mapping of what they (or
others) have landed in which branch all the time.
More information about the firefox-dev