flex-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Alex Harui <aha...@adobe.com>
Subject Re: Issue with merging release with trunk
Date Sat, 29 Dec 2012 04:39:23 GMT

On 12/28/12 6:14 PM, "Justin Mclean" <justin@classsoftware.com> wrote:

> Hi,
>> I did a full checkout of trunk, and merge no longer gave that error but it
>> took so long it timed out.
> Looks like if you check out on people.a.o it works, I'll do a merge, check in
> and tag. Anything that in conflict I'll take the the release version (there a
> few things).
Excellent.  I'm pulling down trunk to run mustella.  Did you revert the
trunk checkins that shouldn't have been checked in?

Alex Harui
Flex SDK Team
Adobe Systems, Inc.

View raw message