WIP: Preserve Windows QEMU guest-agent automation #3

Draft
mfreeman451 wants to merge 1 commit from feat/windows-qemu-guest-agent into main
Owner

Tracks #2.\n\nDurability checkpoint for the clean local feature worktree found during checkout cleanup. The branch contains Windows QEMU guest-agent management but has not been rebased or revalidated against current main; review and finish before merge.

Tracks #2.\n\nDurability checkpoint for the clean local feature worktree found during checkout cleanup. The branch contains Windows QEMU guest-agent management but has not been rebased or revalidated against current main; review and finish before merge.
This pull request has changes conflicting with the target branch.
  • .forgejo/workflows/quality.yml
  • CHANGELOG.md
  • README.md
  • docs/windows-qemu-guest-agent.md
  • galaxy.yml
  • qemu-guest-agent-windows-preflight.yml
  • requirements.yml
  • roles/windows_qemu_guest_agent/README.md
  • roles/windows_qemu_guest_agent/defaults/main.yml
  • roles/windows_qemu_guest_agent/meta/argument_specs.yml
  • roles/windows_qemu_guest_agent/tasks/main.yml
  • tests/validate_repository.py
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin feat/windows-qemu-guest-agent:feat/windows-qemu-guest-agent
git switch feat/windows-qemu-guest-agent

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main
git merge --no-ff feat/windows-qemu-guest-agent
git switch feat/windows-qemu-guest-agent
git rebase main
git switch main
git merge --ff-only feat/windows-qemu-guest-agent
git switch feat/windows-qemu-guest-agent
git rebase main
git switch main
git merge --no-ff feat/windows-qemu-guest-agent
git switch main
git merge --squash feat/windows-qemu-guest-agent
git switch main
git merge --ff-only feat/windows-qemu-guest-agent
git switch main
git merge feat/windows-qemu-guest-agent
git push origin main
Sign in to join this conversation.
No reviewers
No labels
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
carverauto/serviceradar-ansible!3
No description provided.