[Phpmyadmin-devel] Double-checking a commit

[ayush choubey]

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.

Thanks
Ayush
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.phpmyadmin.net/pipermail/developers/attachments/20130517/0171d421/attachment.html>