3 ms·

As far as I’ve used it, git rebases ignore duplicate commits.

• KptMarchewa 5y ago
  They are not duplicate if you change something (like, using amend) in one of the preceding branches.
  • dv_dt 5y ago
    yes that’s a possibility too, but then the typical merge resolution rules should apply. If there are common areas modified that is going to incur a manual review. There’s no magic automation I’d really entrust to fixing that.