[wasm] Template nits 2 #77205
Merged
[wasm] Template nits 2 #77205
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
maraf
commented
Oct 19, 2022
- Drop duplicated description from template json
- Update readme based on suggestion from Unable to run WebAssembly Browser App from VS or CLI #75356 (comment)
|
Tagging subscribers to 'arch-wasm': @lewing Issue Details
|
pavelsavara
approved these changes
Oct 19, 2022
radical
approved these changes
Oct 19, 2022
|
/backport to release/7.0 |
|
Started backporting to release/7.0: https://github.com/dotnet/runtime/actions/runs/3289079306 |
|
@maraf backporting to release/7.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Drop duplicated description.
Using index info to reconstruct a base tree...
M src/mono/wasm/templates/templates/browser/.template.config/template.json
M src/mono/wasm/templates/templates/console/.template.config/template.json
Falling back to patching base and 3-way merge...
Auto-merging src/mono/wasm/templates/templates/console/.template.config/template.json
CONFLICT (content): Merge conflict in src/mono/wasm/templates/templates/console/.template.config/template.json
Auto-merging src/mono/wasm/templates/templates/browser/.template.config/template.json
CONFLICT (content): Merge conflict in src/mono/wasm/templates/templates/browser/.template.config/template.json
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Drop duplicated description.
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.