Re: com php-src: Fix bug #61537 (json_encode() incorrectly truncates/discards information) and remove a test case that's now mooted by this fix.: NEWS
ext/json/json.c ext/json/php_json.h ext/json/tests/bug43941.phpt ext/json/tests/bug54058.

From: Date: Fri, 13 Apr 2012 01:22:45 +0000
Subject: Re: com php-src: Fix bug #61537 (json_encode() incorrectly truncates/discards information) and remove a test case that's now mooted by this fix.: NEWS
ext/json/json.c ext/json/php_json.h ext/json/tests/bug43941.phpt ext/json/tests/bug54058.
References: 1  Groups: php.cvs 
Request: Send a blank email to php-cvs+get-68766@lists.php.net to get a copy of this message
> Any people with more git merging experience want to point to a guide > to dealing with that sort of thing? I've used git for years, but I'm > really having a hard time wrapping my head around the way we're using > it, even with the guides on the Wiki. That's a good point, I think we need to add this to the new GIT-RULES file too, it says there about doing the merges but doesn't say how to handle empty merges, conflicts, etc. Maybe put it into GIT FAQ and put the link to the rules file. -- Stanislav Malyshev, Software Architect SugarCRM: http://www.sugarcrm.com/ (408)454-6900 ext. 227

« previous php.cvs (#68766) next »