Merge Swift 3.1 branch into master #862
Closed
Conversation
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
|
This already has conflicts. In general what we've been doing is this: putting changes in master, then cherry-picking to swift-3.1-branch. It's the process the other projects are using. Personally I prefer to target fixes at the branch and merge to master, but that's not the current setup. I think we could revisit that next time we branch for a release. |
|
Ah - ok. Is this documented anywhere or shall I add to README? |
|
Mostly it's just emails to the various dev lists. |
|
Let's certainly cherry-pick your fix in #843 to master though. |
|
Cherry Pick is happening in #868. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Bring in Swift-3.1 fixes.