flex-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Justin Mclean <jus...@classsoftware.com>
Subject Re: [2/7] git commit: [flex-sdk] [refs/heads/develop] - Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk into develop
Date Wed, 08 May 2013 01:27:49 GMT

> Merge commits are a normal feature of Git and should not cause any confusion. They can
simply be ignored.

There there any case where they would show other changes? ie In the case of a conflict?

If they can be safely ignored can we not have them mailed to the SVN/Git change list?

View raw message