Closed Jesus89 closed 8 years ago
I recommend using git-flow that manages releases/features automatically.
develop
branchplatform.json
manifest. Commitgit-flow
will do rest work automatically.
Also, I can make releases if you don't want to paly with this git-flow.
Great. git-flow is a nice way.
I can manage releases. Thanks!
Do you need any help?
I have created the release, but develop branch has been merged from master instead of release/v1.1.0. Is there a git-flow configuration to enable merging develop from release branch?
Have you done these steps? https://github.com/platformio/platform-lattice_ice40/issues/5#issuecomment-251194473
You should start all work from develop
, not master
. You should not touch master
. git-flow
will automatically merge changes to master and rebase develop
to the latest commit.
Nice! It looks that you forgot to push tag
to remote.
Yes. Tag pushed: https://github.com/platformio/platform-lattice_ice40/releases/tag/v1.1.0.
Thank you! 👍 😊
I can not understand why develop is merged from master instead of the release branch.
$ git flow release start 'v1.1.0'
Switched to a new branch 'release/v1.1.0'
Summary of actions:
- A new branch 'release/v1.1.0' was created, based on 'develop'
- You are now on branch 'release/v1.1.0'
Follow-up actions:
- Bump the version number now!
- Start committing last-minute fixes in preparing your release
- When done, run:
git flow release finish 'v1.1.0'
$ git flow release finish 'v1.1.0'
Switched to branch 'master'
Your branch is up-to-date with 'origin/master'.
Merge made by the 'recursive' strategy.
...
Switched to branch 'develop'
Your branch is up-to-date with 'origin/develop'.
Merge made by the 'recursive' strategy.
...
Deleted branch release/v1.1.0 (was fdb7e14).
Summary of actions:
- Release branch 'release/v1.1.0' has been merged into 'master'
- The release was tagged 'v1.1.0'
- Release tag 'v1.1.0' has been back-merged into 'develop'
- Release branch 'release/v1.1.0' has been locally deleted
- You are now on branch 'develop'
Please read http://nvie.com/posts/a-successful-git-branching-model/
master
branch is used ONLY for RELEASES. We should not code here. The latest branch is develop
.
Yes. I know that. I mean about git-flow automatic tasks. I will investigate that.
The issue I have observed depends on the git-flow version. My git-flow (apt installed) version has different behavior than yours. Simply that.
Fixed using:
$ git config --global gitflow.release.finish.nobackmerge yes
https://github.com/petervanderdoes/gitflow-avh/blob/develop/git-flow-release#L136
Hi,
I have created the release/v1.1.0:
Tests passed. Can I merge in master?