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

Pull Requests in Wrong Tag #60

Closed
GeekOnCoffee opened this issue Mar 4, 2015 · 5 comments
Closed

Pull Requests in Wrong Tag #60

GeekOnCoffee opened this issue Mar 4, 2015 · 5 comments
Labels

Comments

@GeekOnCoffee
Copy link

We're using a workflow similar to Gitflow (http://nvie.com/img/git-model@2x.png) which means we've got pull requests that get merged into develop, but sometimes hot fixes get merged into release and put in a tag without merging develop, but currently all the Pull requests that have been merged into develop show up in that version.

Is there any solution for this, or we going to be out of luck?

@skywinder
Copy link
Member

I'm not completely understand difference between your and GitFlow workflow.
Can you provide example of your case?

@GeekOnCoffee
Copy link
Author

I think our workflow matches gitflow, we're just not using the automated tool for doing it.

skywinder added a commit to github-changelog-generator/changelog_test that referenced this issue Mar 4, 2015
@skywinder skywinder added the bug label Mar 4, 2015
@skywinder
Copy link
Member

@GeekOnCoffee yes, it's my own generated script for bumping: bumper_pusher :)

However, I didn't occur such problems in my repo, but I just created special test repo, and here is a bug! The simple hotfix and now PR in Unreleased section! Thanks for pointing on that! I will handle it soon. Hope this fix will resolve your case too!

@skywinder
Copy link
Member

I believe it's the same problem as #37! So, I have to implement additional checks, and compare not a merged_date, but date of commit, that merge this PR!

@skywinder
Copy link
Member

@GeekOnCoffee Done! 🎉 Try a new version in your workflow. Feel free to open new issue, if you still have a problems with ordering of PR or whatever! ✌️

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

No branches or pull requests

2 participants