Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix bad merge in README. #980

Merged
merged 1 commit into from
Feb 8, 2020
Merged

Fix bad merge in README. #980

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -673,19 +673,11 @@ For each release, the following needs to be done:
* Also ensure that the "Full Changelog" link points to the new version tag instead of the `HEAD`
* Commit this change: `git add CHANGELOG.md && git commit -m "Update change log."`
* Push both commits to origin: `git push -u origin release/x.x.x`
<<<<<<< HEAD
* Push the tag created by the bump script earlier to origin: `git push origin x.x.x`
* Make a pull request against `develop` and await approval of reviewer(s).
* Once approved, merge the PR. If you do this from Github's web interface then use the "Rebase and merge" option to retain the relationship with the tag.
* Fast-forward the master branch: `git checkout master && git merge --ff-only develop && git push origin master`
* Add to [releases](https://github.com/ably/ably-cocoa/releases) - refer to previous releases for release notes format
=======
* Make a pull request against `master` and await approval of reviewer(s).
* Once approved and/or any additional commits have been added, merge the PR. If you do this from Github's web interface then use the "Rebase and merge" option to retain the relationship with the tag.
* Create a tag for this version number: `git checkout master && git pull && git tag x.x.x`
* Push the tag: `git push origin x.x.x`
* Add to [releases](https://github.com/ably/ably-ios/releases) - refer to previous releases for release notes format
>>>>>>> 91f7891d6a5fb06b15dfadb8e924bc1687a4f24e
* Add to [releases](https://github.com/ably/ably-cocoa/releases) - refer to previous releases for release notes format
* Release an update for CocoaPods: `pod trunk push Ably.podspec` (you can, optionally, first run `pod lib lint` to verify that the trunk push should succeed). Details on this command, as well as instructions for adding other contributors as maintainers, are at [Getting setup with Trunk](https://guides.cocoapods.org/making/getting-setup-with-trunk.html) in the [CocoaPods Guides](https://guides.cocoapods.org/).
* Generate the prebuilt framework for Carthage (`carthage build --no-skip-current --archive`) and attach the file generated by that step to the release: `Ably.framework.zip`
* Test the integration of the library in a Xcode project using Carthage and CocoaPods using the [installation guide](https://github.com/ably/ably-cocoa#installation-guide).
Expand Down