undefined | Better HN

0 pointsOJFord2mo ago0 comments

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

0 comments

2 comments · 1 top-level

sheept2mo ago· 1 in thread

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.

OJFordOP2mo ago

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.

j / k navigate · click thread line to collapse