Transform manyToMany from yaml to attributes #308
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
You can use rebase instead of merge |
|
Ok, I can squash, if you like |
|
There is conflict |
|
Yes, there was with #309, resolved it. Sorry for merging. On other projects they complained about force-pushing because it impacted their reviews. |
|
I wrote a blog post how to do rebase on conflicted branch https://samsonasik.wordpress.com/2015/09/16/practical-git-4-rebasing-conflicted-task-branch-against-primary-branch/ |
|
That's not a problem. If you prefer force-pushes, I can do that. I never know what the repo owners prefer. As I said, on other projects they didn't like the force-pushes. I've force-pushed now. |
|
Thank you @uncaught |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adds support for
manyToManyin yamls to convert intoManyToMany/JoinTable/JoinColumn/InvserseJoinColumn.This will have a little conflict with #307, but is easily resolvable by switching
$manyToOnePropertyMappingfor$mapping.