Remix.run Logo
OJFord 7 hours ago

Until someone merges master into their feature branch rather than rebasing it. (And then that branch later gets merged.)

sheept 6 hours ago | parent [-]

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.

OJFord 3 minutes ago | parent [-]

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.