Comment by OJFord
19 hours ago
Until someone merges master into their feature branch rather than rebasing it. (And then that branch later gets merged.)
19 hours ago
Until someone merges master into their feature branch rather than rebasing it. (And then that branch later gets merged.)
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.