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

Jump to bottom

v1.1 tag/release commit is incorrect #804

Closed
rpkilby opened this issue Oct 24, 2017 · 6 comments
Closed

v1.1 tag/release commit is incorrect #804

rpkilby opened this issue Oct 24, 2017 · 6 comments

Comments

@rpkilby
Copy link
Collaborator

rpkilby commented Oct 24, 2017

It's the same as v1.0.4
@carltongibson
Copy link
Owner

Hmmm.

I've got 1.1 at af6cff8
and 1.0.4 at 7e94907

@carltongibson
Copy link
Owner

That seems to match here https://github.com/carltongibson/django-filter/releases

@rpkilby
Copy link
Collaborator Author

rpkilby commented Oct 24, 2017

Oh whoops, I was simply looking at the "27 commits to develop since this release"

@rpkilby
Copy link
Collaborator Author

rpkilby commented Oct 24, 2017

And then assumed that the commits were the same

@rpkilby
Copy link
Collaborator Author

rpkilby commented Oct 24, 2017

Okay, so it looks like develop and master have diverged?

Instead of one release commit, there are two:

@carltongibson
Copy link
Owner

Yeah. Probably. I'm just reviewing #788. Once that's merged I'm going to merge develop into master and delete the develop branch. Everything after that will happen on master.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@carltongibson @rpkilby