8000 Merge 2.11 to 2.12 Aug 6 [ci: last-only] by SethTisue · Pull Request #7005 · scala/scala · GitHub
[go: up one dir, main page]
Skip to content

Merge 2.11 to 2.12 Aug 6 [ci: last-only] #7005

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 8 commits into from
Aug 8, 2018
Merged

Merge 2.11 to 2.12 Aug 6 [ci: last-only] #7005

merged 8 commits into from
Aug 8, 2018

Conversation

SethTisue
Copy link
Member
@SethTisue SethTisue commented Aug 7, 2018 •
edited
Loading

there turned out to be nothing of substance here, but, might
as well get this merged anyway

% git log --oneline -n 1 | cat
90c94cc2ea Merge pull request #6949 from som-snytt/issue/t10956-fix
% git log origin/2.11.x --oneline -n 1 | cat
d209ff4944 Merge pull request #6777 from SethTisue/windows-9881
% git checkout -b merge-2.11-to-2.12-aug-6
Switched to a new branch 'merge-2.11-to-2.12-aug-6'
% git merge-base 2.12.x origin/2.11.x
009e59a8a66fd21f62a7504fb354792495cb6528
% export MB=$(git merge-base 2.12.x origin/2.11.x)
% git log --graph --oneline $MB..origin/2.11.x | cat
*   d209ff4944 Merge pull request #6777 from SethTisue/windows-9881
|\
| * 76cbf10f97 fix Windows-only test failure
|/
*   8c1282dba2 Merge pull request #6464 from robstoll/patch-1
|\
| * 43181945fb fix spelling, which has a parameter type
* 48429388b3 Merge pull request #6195 from mpetruska/SI-9881-fix-retrofit-2.11
* a97cefd9d3 Backport #5640 to 2.11.x
% git merge -sours 48429388b3
Merge made by the 'ours' strategy.
% git merge d209ff4944
Auto-merging spec/03-types.md
warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 1420 and retry the command.
Merge made by the 'recursive' strategy.
 spec/03-types.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

@scala-jenkins scala-jenkins added this to the 2.12.7 milestone Aug 7, 2018
@SethTisue SethTisue self-assigned this Aug 7, 2018
@lrytz lrytz merged commit 4779c42 into scala:2.12.x Aug 8, 2018
@SethTisue SethTisue deleted the merge-2.11-to-2.12-aug-6 branch August 8, 2018 14:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@SethTisue SethTisue

Labels
None yet
Projects
None yet
Milestone
2.12.7
Development

Successfully merging this pull request may close these issues.
6 participants
@SethTisue @lrytz @scala-jenkins @robstoll @mpetruska @adriaanm
0