docs: require a master->develop merge back after every release tag - #280
Merged
Merged
Conversation
Squash-only release commits leave master and develop without shared history, so the next release PR is three-way merged against a pre-squash ancestor and reports phantom add/add conflicts as soon as a file added since then is edited (hit on v1.4.4).
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Adds step 4 to RELEASING.md plus a matching rule.
Squash-only release commits leave master and develop without shared history, so the next release PR is three-way merged against a pre-squash ancestor. Files added since then look independently added on both sides; git auto-resolves that only while the blobs stay byte-identical, which is why releases merged cleanly for months and then v1.4.4 hit phantom conflicts on
resident.rs(its first edit since introduction).The merge back is already done for v1.4.4 (422d07d) — master is now contained in develop again.