Hi all

several times, I've noticed some of you make same changes in all branches. The preferred way (so that we have only one commit in history doing the change) is to make change first in most specific/oldest branch and then merge it to others.

This is also explained on our wiki:

http://wiki.phpmyadmin.net/pma/Git#Committing_fixes_to_several_branches