Skip to content

Update README.md to be consistent within ros-controls (backport #2154) #2196

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.

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

Merged
merged 1 commit into from
Apr 19, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 18, 2025

and

@mergify mergify bot added the conflicts label Apr 18, 2025
Copy link
Contributor Author

mergify bot commented Apr 18, 2025

Cherry-pick of c19997a has failed:

On branch mergify/bp/humble/pr-2154
Your branch is up to date with 'origin/humble'.

You are currently cherry-picking commit c19997a.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	deleted:    .github/ISSUE_TEMPLATE/bug_report.md
	deleted:    .github/ISSUE_TEMPLATE/feature_request.md
	modified:   .github/workflows/README.md
	deleted:    CONTRIBUTING.md
	modified:   README.md

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by them: .github/ISSUE_TEMPLATE/good-first-issue.md
	deleted by them: .github/PULL_REQUEST_TEMPLATE/pull_request_template.md

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@christophfroehlich christophfroehlich force-pushed the mergify/bp/humble/pr-2154 branch from ad29f74 to 29cb2f9 Compare April 18, 2025 13:12
@christophfroehlich christophfroehlich merged commit c4dc149 into humble Apr 19, 2025
3 checks passed
@christophfroehlich christophfroehlich deleted the mergify/bp/humble/pr-2154 branch April 19, 2025 20:44
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