-
-
Notifications
You must be signed in to change notification settings - Fork 844
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鈥檒l occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merge 2.2 #1850
Conversation
Implement ability to define the controller for a subresource
Yeah, because master is protected, only @dunglas can do this AFAIK. |
Would be even better if this could be automated. Although we can have conflicts sometimes or weird tests issues (see my merge 2 weeks ago) so it's not that bad to force us to do a merge request and see if tests are okay. Oh and btw I usually do:
|
thanks @sroze |
That's too dangerous. With great power comes great responsibility. 馃槅 |
@sroze I believe For a second I was tempted to do so too in #1909, but then I realized the consequences before bad things happened... @dunglas I think we need to push-protect the stable and old stable branches too? (Is the GitHub "Update branch" button subject to that restriction though? Or is there a way to disable the GitHub "Update branch" button? :x) |
Huh. How did master get merged into 2.2? |
See my comment right above yours. 馃槢 GitHub shows a highly dangerous "Update branch" button when the PR branch is outdated compared to the base branch. And unfortunately in this case, the PR branch was |
Aha! O dear! |
Outch. 馃 |
Seems like the last commit of this PR should be reverted on 2.2, WDYT? 馃 |
It creates too much conflicts. I tried it last night. I'd suggest instead to reset the working directory to its parent commit on the |
@teohhanhui we're having a similar problem on the Symfony docs right now. Would you be able/willing to walk us through what your process was to solve this? |
@weaverryan I'll take a look and let you know in a bit. 馃槃 |
It's a bit annoying not to be able to simply to
git merge 2.2 && git push upstream master
locally 馃