You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
This file contains 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
Recently, the release scripts failed trying to merge the release-v4.9 branch back to master. The reason is that merging with -X theirs strategy doesn't solve conflicts for files modified in release-v4.9 and deleted in master, which is the case for multiple contracts we've removed for 5.0
With this change, the conflicts will be solved by removing the files as they're removed in master.
Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.
This PR includes no changesets
When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types
Put on hold since we may want to remove that part of the workflow. We've realized there are a few edge cases that require manual review and are frequent enough to prefer manual intervention over a fine-tuned automation.
Yes, I vote for removing automatic merge resolution. We should create the merge/release-vX.Y branch pointing to the latest commit of release-vX.Y and create the PR, but expect manual resolution from that point on. It may not be necessary in some cases and GitHub might just work.
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.
ernestognw
added
ignore-changeset
on hold
frangio
removed
the
on hold
Description
Recently, the release scripts failed trying to merge the
release-v4.9branch back to master. The reason is that merging with-X theirsstrategy doesn't solve conflicts for files modified inrelease-v4.9and deleted inmaster, which is the case for multiple contracts we've removed for 5.0With this change, the conflicts will be solved by removing the files as they're removed in master.