Backport PR #2623 to release/v1.7 for Update Actions dependency #2626
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,5 @@ | ||
| <<<<<<< HEAD | ||
| 2.18.1 | ||
| ======= | ||
| 2.18.4 | ||
| >>>>>>> b63d3de04 ([create-pull-request] automated change (#2623)) | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,5 @@ | ||
| <<<<<<< HEAD | ||
| 2.18.1 | ||
| ======= | ||
| 2.18.4 | ||
| >>>>>>> b63d3de04 ([create-pull-request] automated change (#2623)) | ||
|
Comment on lines
+1
to
+5
There was a problem hiding this comment. Resolve the merge conflict before merging the PR. The file contains an unresolved merge conflict, as indicated by the presence of merge conflict markers ( Merge conflicts can lead to broken builds, unexpected behavior, or even introduce security vulnerabilities if not resolved correctly. The merge conflict resolution should be done manually to ensure the correct version ( Please resolve the merge conflict by removing the conflict markers and keeping the intended changes. After resolving the conflict, make sure to test the changes thoroughly to confirm the expected behavior. |
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,5 @@ | ||
| <<<<<<< HEAD | ||
| 2.18.1 | ||
| ======= | ||
| 2.18.4 | ||
| >>>>>>> b63d3de04 ([create-pull-request] automated change (#2623)) | ||
|
Comment on lines
+1
to
+5
There was a problem hiding this comment. Resolve the merge conflict. The diff contains merge conflict markers, which indicate that the changes were not properly resolved before committing. Please resolve the conflict by removing the conflict markers and keeping only the desired version number. |
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,5 @@ | ||
| <<<<<<< HEAD | ||
| 2.18.1 | ||
| ======= | ||
| 2.18.4 | ||
| >>>>>>> b63d3de04 ([create-pull-request] automated change (#2623)) | ||
|
Comment on lines
+1
to
+5
There was a problem hiding this comment. Resolve merge conflicts before creating the PR. The diff contains merge conflict markers ( |
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,5 @@ | ||
| <<<<<<< HEAD | ||
| 6.1.0 | ||
| ======= | ||
| 7.0.2 | ||
| >>>>>>> b63d3de04 ([create-pull-request] automated change (#2623)) | ||
|
Comment on lines
+1
to
+5
There was a problem hiding this comment. Resolve the merge conflicts before merging the changes. The file contains Git conflict markers, indicating that the changes were not properly merged. This is a critical issue that needs to be addressed before merging the pull request. To resolve the merge conflicts:
Once the merge conflicts are resolved, the pull request can be safely merged. |
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Resolve the merge conflict.
The diff contains merge conflict markers, which indicate that the changes were not properly merged. Please resolve the merge conflict by removing the conflict markers and keeping only the desired version.