2012/4/12 Johannes Schlüter <johan...@schlueters.de>:
> please make sure to merge things upwards. i see the patch was applied to
> 5.4 and master, too, but git doesn't know about the merge.

I thought I had, to be honest — there was a conflict on NEWS (not
surprising), but I thought I'd resolved that properly.

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.


PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to