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

Skip to content

Conversation

@steveisok
Copy link
Contributor

No description provided.

@steveisok
Copy link
Contributor Author

@monojenkins backport 2019-08

@monojenkins
Copy link
Contributor

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

Applying: Bump to mono/corefx@e79cf5b
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@e79cf5b

Please backport manually!

steveisok pushed a commit to steveisok/mono that referenced this pull request Sep 11, 2019
@steveisok
Copy link
Contributor Author

@monojenkins build failed

@steveisok
Copy link
Contributor Author

@monojenkins backport 2019-06

@monojenkins
Copy link
Contributor

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

Applying: Bump to mono/corefx@e79cf5b
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@e79cf5b

Please backport manually!

steveisok pushed a commit to steveisok/mono that referenced this pull request Sep 11, 2019
@marek-safar marek-safar merged commit 95cd0e7 into mono:master Sep 12, 2019
marek-safar pushed a commit that referenced this pull request Sep 12, 2019
marek-safar pushed a commit that referenced this pull request Sep 12, 2019
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.

3 participants