Skip to content

Resolve merge conflicts in actions/checkout v4→v5 upgrade#13

Closed
Copilot wants to merge 17 commits into
dependabot/github_actions/actions/checkout-5from
copilot/sub-pr-9
Closed

Resolve merge conflicts in actions/checkout v4→v5 upgrade#13
Copilot wants to merge 17 commits into
dependabot/github_actions/actions/checkout-5from
copilot/sub-pr-9

Conversation

Copy link
Copy Markdown
Contributor

Copilot AI commented Nov 12, 2025

The dependabot PR bumping actions/checkout from v4 to v5 had merge conflicts with main branch due to workflow file reformatting (2-space → 4-space indentation).

Changes

  • Merged main branch into dependabot PR branch
  • Resolved conflict in .github/workflows/tests.yml by keeping v5 upgrade with 4-space indentation from main
steps:
    - name: Checkout code
      uses: actions/checkout@v5  # Upgraded from v4, using main's indentation

✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.

munezaclovis and others added 16 commits September 30, 2025 02:30
* chore: run prettier

* chore: setup prettier and plugins

* actually dont need tailwind as dependency
…#12)

* Initial plan

* Add script() method to MogManager.php with version query string and attributes

Co-authored-by: munezaclovis <51137458+munezaclovis@users.noreply.github.com>

* Add documentation to script() method

Co-authored-by: munezaclovis <51137458+munezaclovis@users.noreply.github.com>

* Call script() method from @mog directive using Laravel container

Co-authored-by: munezaclovis <51137458+munezaclovis@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: munezaclovis <51137458+munezaclovis@users.noreply.github.com>
Bumps [stefanzweifel/git-auto-commit-action](https://github.com/stefanzweifel/git-auto-commit-action) from 6 to 7.
- [Release notes](https://github.com/stefanzweifel/git-auto-commit-action/releases)
- [Changelog](https://github.com/stefanzweifel/git-auto-commit-action/blob/master/CHANGELOG.md)
- [Commits](stefanzweifel/git-auto-commit-action@v6...v7)

---
updated-dependencies:
- dependency-name: stefanzweifel/git-auto-commit-action
  dependency-version: '7'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
# Conflicts:
#	.github/workflows/tests.yml
Copilot AI changed the title [WIP] Update actions/checkout from 4 to 5 Resolve merge conflicts in actions/checkout v4→v5 upgrade Nov 12, 2025
Copilot AI requested a review from munezaclovis November 12, 2025 20:07
@munezaclovis munezaclovis deleted the copilot/sub-pr-9 branch December 18, 2025 07:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants