-
intrigeri authored
When preparing a bugfix release, or when one has correctly resolved merged conflicts in the previous step, this operation is a no-op. That's fine. But let's keep it around as a fail-safe, in case a mistake was made during the merge conflict resolution previously.
839c4dfd