Skip to content

test 2 (CUSTOM WORKFLOW): Bot comment in conflict scenario#20

Merged
atif09 merged 1 commit intomasterfrom
test-real-conflict
Feb 11, 2026
Merged

test 2 (CUSTOM WORKFLOW): Bot comment in conflict scenario#20
atif09 merged 1 commit intomasterfrom
test-real-conflict

Conversation

@atif09
Copy link
Copy Markdown
Owner

@atif09 atif09 commented Feb 11, 2026

[backport 1.1]

Checklist

  • I have read the OpenWISP Contributing Guidelines.
  • I have manually tested the changes proposed in this pull request.
  • I have written new test cases for new code and/or updated existing tests for changes to existing code.
  • I have updated the documentation.

Reference to Existing Issue

Closes #.

Please open a new issue if there isn't an existing issue yet.

Description of Changes

Please describe these changes.

Screenshot

Please include any relevant screenshots.

@atif09 atif09 merged commit d4251a5 into master Feb 11, 2026
0 of 14 checks passed
@github-actions
Copy link
Copy Markdown

❌ Cherry-pick to 1.1 failed due to conflicts. Please backport manually:

git fetch origin 1.1
git checkout -b backport/20-to-1.1 origin/1.1
git cherry-pick -x d4251a52b3ae47849827bb1bbe1a1348a668ac39
# resolve conflicts
git cherry-pick --continue
git push origin backport/20-to-1.1

Then open a PR targeting 1.1.

@atif09 atif09 changed the title [fix] Test real conflict test 2 (CUSTOM WORKFLOW): Bot comment in conflict scenario Feb 11, 2026
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.

1 participant