[release/dev18.0] Fix parameter syntax in pipeline definition #81286
Conversation
|
/backport to release/17.14 |
|
/backport to release/17.12 |
|
Started backporting to |
|
/backport to release/17.11 |
|
/backport to release/17.10 |
|
Started backporting to |
|
/backport to release/17.8 |
|
Started backporting to |
|
Started backporting to |
|
Started backporting to |
|
@JoeRobich an error occurred while backporting to |
|
@JoeRobich an error occurred while backporting to |
|
@JoeRobich an error occurred while backporting to |
|
@JoeRobich an error occurred while backporting to |
|
/backport to release/dev17.14 |
|
@JoeRobich an error occurred while backporting to |
|
/backport to release/dev17.12 |
|
Started backporting to |
|
/backport to release/dev17.11 |
|
Started backporting to |
|
Started backporting to |
|
@JoeRobich backporting to git am output$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Fix parameter syntax in pipeline definition
Using index info to reconstruct a base tree...
M azure-pipelines-official.yml
Falling back to patching base and 3-way merge...
Auto-merging azure-pipelines-official.yml
CONFLICT (content): Merge conflict in azure-pipelines-official.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Fix parameter syntax in pipeline definition
Error: The process '/usr/bin/git' failed with exit code 128 |
… definition (#81297) Backport of #81286 to release/dev17.14 /cc @JoeRobich @github-actions[bot] ## Customer Impact ## Regression - [ ] Yes - [ ] No [If yes, specify when the regression was introduced. Provide the PR or commit if known.] ## Testing [How was the fix verified? How was the issue missed previously? What tests were added?] ## Risk [High/Medium/Low. Justify the indication by mentioning how risks were measured and addressed.] --------- Co-authored-by: Jan Jones <janjones@microsoft.com>
|
@JoeRobich backporting to git am output$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Fix parameter syntax in pipeline definition
Using index info to reconstruct a base tree...
M azure-pipelines-official.yml
Falling back to patching base and 3-way merge...
Auto-merging azure-pipelines-official.yml
CONFLICT (content): Merge conflict in azure-pipelines-official.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Fix parameter syntax in pipeline definition
Error: The process '/usr/bin/git' failed with exit code 128 |
Backport of #81271 to release/dev18.0
/cc @jjonescz
Customer Impact
Regression
[If yes, specify when the regression was introduced. Provide the PR or commit if known.]
Testing
[How was the fix verified? How was the issue missed previously? What tests were added?]
Risk
[High/Medium/Low. Justify the indication by mentioning how risks were measured and addressed.]