Why not just stash your admins.txt change and reapply it after you've pulled your changes.