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

Merge release 2.2.1 into 2.3.x #907

Merged
merged 2 commits into from
Jan 18, 2020

Conversation

doctrinebot
Copy link

Release 2.2.1

2.2.1

  • Total issues resolved: 0
  • Total pull requests resolved: 2
  • Total contributors: 2

Bug

Documentation

@alcaeus
Copy link
Member

alcaeus commented Jan 10, 2020

@goetas I'll let you decide whether to merge this manually when you upmerge to master, but you can also merge this PR and go from there.

@goetas
Copy link
Member

goetas commented Jan 10, 2020

Will merge manually, to have a fast forward commit. Are you ok with it?

@alcaeus
Copy link
Member

alcaeus commented Jan 10, 2020

Sounds good to me.

@alcaeus alcaeus closed this Jan 10, 2020
@alcaeus alcaeus deleted the 2.2.x-merge-up-into-2.3.x_5e182ad4f31eb2.86467913 branch January 10, 2020 08:10
@goetas goetas restored the 2.2.x-merge-up-into-2.3.x_5e182ad4f31eb2.86467913 branch January 18, 2020 04:22
@goetas goetas reopened this Jan 18, 2020
@greg0ire
Copy link
Member

greg0ire commented Jan 18, 2020

What do you mean by fast forward commit? The only situation if you could have a fast forward IMO would be if 2.2 were based on 2.3, and that's not the case is it?

@goetas
Copy link
Member

goetas commented Jan 18, 2020

My bad, I think I have misunderstood the feature

@goetas
Copy link
Member

goetas commented Jan 18, 2020

Will take care of it tomorrow

@greg0ire
Copy link
Member

I can take care of it if you want. IMO we just have to merge this or overwrite 2.3.x with this 2.2.x-merge-up-into-2.3.x_5e182ad4f31eb2.86467913 if we want to avoid the double merge commit

@goetas goetas merged commit de7d2a3 into 2.3.x Jan 18, 2020
@goetas goetas deleted the 2.2.x-merge-up-into-2.3.x_5e182ad4f31eb2.86467913 branch January 18, 2020 17:25
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.

5 participants