[Phpmyadmin-devel] Martynas tree - Git merge

Martynas Mickevičius mmartynas at gmail.com
Thu Jul 29 14:06:21 CEST 2010

Thanks for this message. I completely forgot about the Master. I merged my
fork with the master and pushed the changes now.

2010/7/29 Herman van Rink <rink at initfour.nl>

> Martynas,
> I tried to merge the current master into your branch, just for the fun
> of it. Only server_status.php had a merge conflict, just the added
> require_once './libraries/chart.lib.php'; and it's comment block which
> interfered with another change.
> So maybe it's a good idea to merge master every now and then.
> I'd hate to have a problem later when we try to merge your tree back
> into master.
> --
> Met vriendelijke groet / Regards,
> Herman van Rink
> Initfour websolutions
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.phpmyadmin.net/pipermail/developers/attachments/20100729/1e03496b/attachment.html>

More information about the Developers mailing list