Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Conversation

@steveisok
Copy link
Contributor

@lambdageek
Copy link
Member

Submodules are awesome. Looks like this is pulling in changes from #18305, also

@steveisok
Copy link
Contributor Author

That's what I get for assuming it was clean.

@steveisok
Copy link
Contributor Author

I can wait until @marek-safar makes his ok ;-)

@marek-safar
Copy link
Member

It's fine to pull that change in (the files are not used yet)

@steveisok
Copy link
Contributor Author

@monojenkins build failed

1 similar comment
@steveisok
Copy link
Contributor Author

@monojenkins build failed

@steveisok steveisok merged commit 6f24832 into mono:master Dec 31, 2019
@steveisok
Copy link
Contributor Author

@monojenkins backport 2019-12

@monojenkins
Copy link
Contributor

@steveisok backporting to 2019-12 failed, the patch results in conflicts:

Applying: Bump to mono/corefx@bff1d77
Using index info to reconstruct a base tree...
M	external/corefx
Falling back to patching base and 3-way merge...
warning: Failed to merge submodule external/corefx (not checked out)
Auto-merging external/corefx
CONFLICT (submodule): Merge conflict in external/corefx
error: Failed to merge in the changes.
Patch failed at 0001 Bump to mono/corefx@bff1d77

Please backport manually!

steveisok pushed a commit to steveisok/mono that referenced this pull request Dec 31, 2019
lambdageek pushed a commit that referenced this pull request Jan 3, 2020
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.

4 participants