This repository was archived by the owner on Mar 10, 2022. It is now read-only.
Merging missing stuff from the dev branch #25
Merged
Conversation
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
|
I agree, we have somehow freestyled the branches on this repo. The solution seems fine to me, I'll merge this in Swift 3.0 and it would be awesome if you could do the remaining changes as you wrote. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
The branches have diverted a bit.
Master is using swift 2.3. Dev was branched from master, and it got worked on quite a lot. Then there are 4 commits made directly to master, but those are only travis-related, so they're no big issue. We need to fix Travis anyway :). Swift-3.0 was branched from master way before dev was branched. So swift-3.0 and dev have diverted. Dev is the nice one, with some extra documentation and README. I cherry picked some commits from it and manually added the documentation where necessary on the swift-3.0 branch.
The tests are a bit different on the two branches, but they both seem to be thoroughly tested.
Spinner 0.2.7 is the latest swift 2.3 release, and it uses the latest commit on the dev branch.
The goal would be to merge this branch into swift-3.0, then swift-3.0 into master. Then delete the dev branch and make a new development branch from master (in which we just merged swift-3.0).
I don't think we're losing anything important from the dev branch after merging this. Maybe some tests, but again, the swift-3.0 branch is pretty well tested, and we can always add more tests. Let me know what you think.