[phpMyAdmin Developers] Github "rebase" feature when merging