Re: NEWS file rename

From: Date: Sun, 03 Mar 2013 21:02:50 +0000
Subject: Re: NEWS file rename
References: 1 2 3  Groups: php.internals 
Request: Send a blank email to internals+get-66454@lists.php.net to get a copy of this message
Hi! > Everytime I want to merge up from PHP-5.3 to 5.4 to 5.5 to master for > the timezone database I get conflicts in NEWS, I don't even touch that > file. Did you set up git as described in https://wiki.php.net/vcs/gitfaq#mandatory_git_settings ? Because I never had merge conflicts in NEWS, it shouldn't be even possible with this setup... -- Stanislav Malyshev, Software Architect SugarCRM: http://www.sugarcrm.com/ (408)454-6900 ext. 227

« previous php.internals (#66454) next »