This shouldn't be a problem if you stick to commits and merges. --first-parent will skip past commits, including merge commits, in merged branches.

Fair – but not if it's not their feature branch but their local master; they pull & merge the remote changes and then push the result.