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

fix documentation build errors #345

Merged
merged 1 commit into from
Jun 27, 2020
Merged

fix documentation build errors #345

merged 1 commit into from
Jun 27, 2020

Conversation

xabbuh
Copy link
Member

@xabbuh xabbuh commented Jun 25, 2020

No description provided.

@greg0ire
Copy link
Member

@xabbuh should this maybe target a lower branch?

@greg0ire
Copy link
Member

Looks like you already did in #344, sorry, I didn't notice.

@SenseException
Copy link
Member

Is an upmerge to master the prefered way or should this PR introduce the changes?

@goetas
Copy link
Member

goetas commented Jun 26, 2020

It will take some time, but #344 will be upmerged to 3.x and master (there is already a first PR #346 for that). In this way we avoid conflicts and duplicate commits.

Thanks @xabbuh !

@goetas goetas closed this Jun 26, 2020
@@ -97,6 +97,7 @@ application:

- The ``services`` node allows you to provide custom services to the underlying ``DependencyFactory`` part of ``doctrine/migrations``.
- The node ``factories`` is similar to ``services``, with the difference that it accepts only callables.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@goetas When merging up this blank line is important (it's not missing in the lower branch).

@greg0ire greg0ire reopened this Jun 26, 2020
@greg0ire greg0ire requested a review from goetas June 26, 2020 20:05
Copy link
Member

@goetas goetas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lets merge it and see what it happens :)

@goetas goetas merged commit acbb8cb into master Jun 27, 2020
@xabbuh xabbuh deleted the xabbuh-patch-2 branch June 27, 2020 09:37
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.

None yet

4 participants