On 03/19/2012 01:31 PM, Kris Craig wrote:
Here's what I wound-up doing: The merge entries on the workflow page now contain "--no-ff" and I added an entry to the FAQ about the merge.ff option available in newer clients. This way we should be covered either way. =) --Kris
Is this supported by the php-src repo? This is what I get after using --no-ff: $ git push origin To https://git.php.net/repository/php-src.git ! [rejected] PHP-5.3 -> PHP-5.3 (non-fast-forward) ! [rejected] PHP-5.4 -> PHP-5.4 (non-fast-forward) ! [rejected] master -> master (non-fast-forward) error: failed to push some refs to 'https://git.php.net/repository/php-src.git' To prevent you from losing history, non-fast-forward updates were rejected Merge the remote changes (e.g. 'git pull') before pushing again. See the 'Note about fast-forwards' section of 'git push --help' for details. -- Email: christopher.jo...@oracle.com Tel: +1 650 506 8630 Blog: http://blogs.oracle.com/opal/ -- PHP Internals - PHP Runtime Development Mailing List To unsubscribe, visit: http://www.php.net/unsub.php
