Skip to content

Improve reapplying when there are manually added commits on the changeset

Created by: malomarrec

Problem

When updating an already published batch change spec, the new commits are force-pushed.

  • If the commit on the changeset was created by the batch change, it is erased. Fine
  • If there were additional, manual commits on the changeset, they are also nuked. This is a problem because we are erasing useful work.

Potential solutions

  • fail or ignore that changeset
  • maybe a better version of this: put it in a queue with a needs review status, then the batch change owner can decide to force push, or ignore. Bulk actions would make that easier.
  • attempt a merge commit

Impacted customers