flex-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Justin Mclean <jus...@classsoftware.com>
Subject Git merge of release apache-flex-skd-4.10.0 tag into master
Date Thu, 25 Jul 2013 09:12:21 GMT
Hi,

As I feared there's 1600+ conflicts when merging the apache-flex-skd-4.10.0 tag into master.
 Can someone who more experience with Git lend a hand here - it seems very strange to me that
there would be any conflicts let alone that number.

Thanks,
Justin
Mime
View raw message