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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 2.2 #1850

Merged
merged 5 commits into from
Apr 12, 2018
Merged

Merge 2.2 #1850

merged 5 commits into from
Apr 12, 2018

Conversation

sroze
Copy link
Contributor

@sroze sroze commented Apr 12, 2018

It's a bit annoying not to be able to simply to git merge 2.2 && git push upstream master locally 馃

@Simperfit
Copy link
Contributor

Yeah, because master is protected, only @dunglas can do this AFAIK.

@soyuka
Copy link
Member

soyuka commented Apr 12, 2018

It's a bit annoying not to be able to simply to git merge 2.2 && git push upstream master

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:

git checkout 2.2
git rebase master
git checkout master
git merge 2.2

@meyerbaptiste
Copy link
Member

iznogoud_english

@soyuka soyuka merged commit 3fdd546 into master Apr 12, 2018
@soyuka
Copy link
Member

soyuka commented Apr 12, 2018

thanks @sroze

@teohhanhui
Copy link
Contributor

It's a bit annoying not to be able to simply to git merge 2.2 && git push upstream master locally

That's too dangerous. With great power comes great responsibility. 馃槅

@teohhanhui
Copy link
Contributor

teohhanhui commented May 1, 2018

@sroze I believe master was accidentally merged into 2.2 as part of preparing this PR. Did you use the very dangerous GitHub "Update branch" button? 馃ぃ

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)

@teohhanhui teohhanhui mentioned this pull request May 1, 2018
@bendavies
Copy link
Contributor

Huh. How did master get merged into 2.2?

@teohhanhui
Copy link
Contributor

teohhanhui commented May 1, 2018

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 2.2.

@bendavies
Copy link
Contributor

Aha! O dear!

@teohhanhui teohhanhui mentioned this pull request May 2, 2018
@sroze
Copy link
Contributor Author

sroze commented May 2, 2018

Outch. 馃

@sroze
Copy link
Contributor Author

sroze commented May 2, 2018

Seems like the last commit of this PR should be reverted on 2.2, WDYT? 馃

@teohhanhui
Copy link
Contributor

teohhanhui commented May 2, 2018

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 2.2 side and reapply the relevant commits since then in the working directory. A manual revert commit, sort of. (And then we'll have to take care to revert this revert commit when we merge into master? Or if I remember correctly, there should be a way to indicate that the branches are merged without actually touching the index.)

@weaverryan
Copy link
Contributor

@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?

@teohhanhui
Copy link
Contributor

@weaverryan I'll take a look and let you know in a bit. 馃槃

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

8 participants