3 ms·
Until someone merges master into their feature branch rather than rebasing it. (And then that branch later gets merged.)
by OJFord 6mo ago
Until someone merges master into their feature branch rather than rebasing it. (And then that branch later gets merged.)
- sheept 6mo agoThis 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 6mo agoFair – but not if it's not their feature branch but their local master; they pull & merge the remote changes and then push the result.