Skip to content

Remove duplicated changelog entry for 5.3.1#6279

Merged
RonnyPfannschmidt merged 1 commit intopytest-dev:masterfrom
nicoddemus:fix-changelog
Nov 26, 2019
Merged

Remove duplicated changelog entry for 5.3.1#6279
RonnyPfannschmidt merged 1 commit intopytest-dev:masterfrom
nicoddemus:fix-changelog

Conversation

@nicoddemus
Copy link
Member

No description provided.

@RonnyPfannschmidt RonnyPfannschmidt merged commit 6d31684 into pytest-dev:master Nov 26, 2019
@blueyed
Copy link
Contributor

blueyed commented Nov 27, 2019

@nicoddemus
Just out of curiousity: why haven't you amended the existing PR where I've pointed that out already? (#6277 (comment))
(now the tag has the wrong changelog)

Also just re-generating the release-PR would have avoided conflicts with #6272, which came before already (which you now have to resolve manually).
I am just trying to understand your workflow there..

@nicoddemus nicoddemus deleted the fix-changelog branch November 28, 2019 00:06
@nicoddemus
Copy link
Member Author

Sorry @blueyed, my bad. As you said it probably would have been easier to just generate the release branch again. As per #6272 (comment), I will open a new PR implementing your suggestion (it would be nice if you ressuciated this branch though: https://github.com/blueyed/pytest/tree/docs).

@blueyed
Copy link
Contributor

blueyed commented Nov 28, 2019

@nicoddemus restored the branch (JFI: typically it should also work by restoring it using the commit hash, but not sure if that is fetchable for you etc)

@nicoddemus
Copy link
Member Author

JFI: typically it should also work by restoring it using the commit hash, but not sure if that is fetchable for you etc

Yeah I wasn't sure if it would be reachable for me, even if I fetched your fork. Thanks for restoring it. 👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants