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.

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

Cannot obtain proper commits in scheme of two branches with cross-merges #26

Open
antongolub opened this issue Jul 22, 2020 · 3 comments
Labels
bug Something isn't working

Comments

@antongolub
Copy link
Collaborator

N.B It's worth noting that we're loosely following a Git Flow approach. So our process is:
A) Branch off develop to work on a new feature. (commit as much as you like without using conventional commit messages)
B) When the feature is complete, merge to develop using a conventional commit message (to allow that feature to be included i the changelog)
C) When we're ready for a prod release, we'll merge develop to master and run tagging/versioning (using semantic-release/multi-semantic-release

During testing, I've been branching off master then merging straight back into master just to save time and that all worked well.

When I came to do my final test by following the actual process which is branch off develop then merge back to develop then when we have a set of features ready we'll merge develop to master I noticed that when I run multi-semantic-release on master it doesn't pick up the merge commits. Would you be able to resolve this issue as well?

Originally posted by @musaabal-okaidi in #20 (comment)

@antongolub antongolub added the bug Something isn't working label Jul 22, 2020
@antongolub
Copy link
Collaborator Author

@musaabal-okaidi
I cannot promise that we will fix it quickly. Vacation season, lack of resources.

@ghost
Copy link

ghost commented Jul 22, 2020

No worries. I've changed the release to run from the develop branch. I'm also considering switching from Gitflow to GitHub Flow as it seems more fitting for us. And with GitHub Flow there's only master without develop so we won't have to merge twice.

However; it's still good to add this feature to multi-semantic-release for anyone strictly adhering to Gitflow. We might start using multi-semantic-release for other repos that use Gitflow.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

No branches or pull requests

1 participant