Delete endpoint on startup #2164
Merged
Conversation
This file contains 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
jander-msft
reviewed
Jul 24, 2022
src/Microsoft.Diagnostics.Monitoring.Options/DiagnosticPortOptions.cs
Outdated
Show resolved
Hide resolved
src/Microsoft.Diagnostics.Monitoring.Options/OptionsDisplayStrings.resx
Outdated
Show resolved
Hide resolved
kkeirstead
reviewed
Jul 25, 2022
src/Microsoft.Diagnostics.Monitoring.Options/DiagnosticPortOptions.cs
Outdated
Show resolved
Hide resolved
kkeirstead
reviewed
Jul 25, 2022
kkeirstead
reviewed
Jul 25, 2022
src/Microsoft.Diagnostics.Monitoring.Options/DiagnosticPortOptionsDefaults.cs
Outdated
Show resolved
Hide resolved
jander-msft
added
servicing-patch
wiktork
force-pushed
the
dev/wiktork/addressFix
branch
from
a69b1be to
029a560
Compare
wiktork
commented
Jul 26, 2022
jander-msft
approved these changes
Jul 26, 2022
|
/backport to main |
|
Started backporting to main: https://github.com/dotnet/dotnet-monitor/actions/runs/2742897523 |
|
/backport to release/6.2 |
|
Started backporting to release/6.2: https://github.com/dotnet/dotnet-monitor/actions/runs/2742899872 |
|
@jander-msft backporting to release/6.2 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Delete endpoint on startup
.git/rebase-apply/patch:94: trailing whitespace.
.git/rebase-apply/patch:218: trailing whitespace.
.git/rebase-apply/patch:227: trailing whitespace.
warning: 3 lines add whitespace errors.
Using index info to reconstruct a base tree...
M documentation/schema.json
M src/Microsoft.Diagnostics.Monitoring.Options/OptionsDisplayStrings.Designer.cs
M src/Microsoft.Diagnostics.Monitoring.Options/OptionsDisplayStrings.resx
M src/Tools/dotnet-monitor/Strings.Designer.cs
M src/Tools/dotnet-monitor/Strings.resx
Falling back to patching base and 3-way merge...
Auto-merging src/Tools/dotnet-monitor/Strings.resx
Auto-merging src/Tools/dotnet-monitor/Strings.Designer.cs
Auto-merging src/Microsoft.Diagnostics.Monitoring.Options/OptionsDisplayStrings.resx
CONFLICT (content): Merge conflict in src/Microsoft.Diagnostics.Monitoring.Options/OptionsDisplayStrings.resx
Auto-merging src/Microsoft.Diagnostics.Monitoring.Options/OptionsDisplayStrings.Designer.cs
Auto-merging documentation/schema.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 Delete endpoint on startup
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! |
jander-msft
pushed a commit
to jander-msft/dotnet-monitor
that referenced
this pull request
Jul 26, 2022
* Delete endpoint on startup * PR feedback * Update documentation/schema.json
This was referenced Jul 27, 2022
Closed
jander-msft
removed
servicing-patch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Possible fix for #2118 and #1827