On May 16, 2013, at 9:29 PM, ayush choubey <ayush.choubey@gmail.com> wrote:
Sir, i Just updated my master branch from upstream and then updated my origin/master, just to avoid those problem of getting merge conflicts in the future and then saw this message. Do you think this updation will cause some problem in merging, i still consider myself pretty inexperienced when it comes to git, so i thought i should just ask, and revert back to the last commit if it's going to create problem.
No worries — I believe this is entirely my fault
Thanks Ayush
------------------------------------------------------------------------------ AlienVault Unified Security Management (USM) platform delivers complete security visibility with the essential security capabilities. Easily and efficiently configure, manage, and operate all of your security controls from a single console and one unified framework. Download a free trial. http://p.sf.net/sfu/alienvault_d2d _______________________________________________ Phpmyadmin-devel mailing list Phpmyadmin-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/phpmyadmin-devel