Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backport PR #2623 to release/v1.7 for Update Actions dependency #2626

Closed
wants to merge 1 commit into from
Closed

Backport PR #2623 to release/v1.7 for Update Actions dependency #2626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions versions/actions/GITHUB_CODEQL_ACTION_ANALYZE
View file
Open in desktop
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
Copy link
Contributor

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.

4 changes: 4 additions & 0 deletions versions/actions/GITHUB_CODEQL_ACTION_AUTOBUILD
View file
Open in desktop
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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Resolve the merge conflict before merging the PR.

The file contains an unresolved merge conflict, as indicated by the presence of merge conflict markers (<<<<<<<, =======, >>>>>>>). This is a critical issue that needs to be addressed before merging the PR.

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 (2.18.4) is kept and any conflicting changes are properly handled.

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.

4 changes: 4 additions & 0 deletions versions/actions/GITHUB_CODEQL_ACTION_INIT
View file
Open in desktop
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
Copy link
Contributor

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 resolved before committing. Please resolve the conflict by removing the conflict markers and keeping only the desired version number.

4 changes: 4 additions & 0 deletions versions/actions/GITHUB_CODEQL_ACTION_UPLOAD_SARIF
View file
Open in desktop
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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Resolve merge conflicts before creating the PR.

The diff contains merge conflict markers (<<<<<<<, =======, >>>>>>>). These should have been resolved before creating the PR. Please resolve the conflicts, commit the changes, and update the PR.

4 changes: 4 additions & 0 deletions versions/actions/PETER_EVANS_CREATE_PULL_REQUEST
View file
Open in desktop
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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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:

  1. Manually edit the file to remove the conflict markers (<<<<<<<, =======, >>>>>>>).
  2. Ensure that the file only contains the intended changes (i.e., the updated version number 7.0.2).
  3. Stage the changes using git add versions/actions/PETER_EVANS_CREATE_PULL_REQUEST.
  4. Commit the changes using git commit -m "Resolve merge conflicts".
  5. Push the changes to the remote branch using git push.

Once the merge conflicts are resolved, the pull request can be safely merged.

Loading