incubator-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 05:30:34 GMT



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

> Hi,
> 
>> Did you revert the trunk checkins that shouldn't have been checked in?
> 
> No just overrode anything in conflict with the release version, everything
> should of been in develop/release anyway. (ie same changes checked in twice)
Well, it leaves the history a bit off because it might fool someone else
into committing into trunk and it will only get checked in once, I think.
Those files that were already changed probably aren't in the commit for the
merge since there were no diffs.

But I guess it will be ok.

-- 
Alex Harui
Flex SDK Team
Adobe Systems, Inc.
http://blogs.adobe.com/aharui


Mime
View raw message