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

rolling Fix merging conflict #84

Open
fmrico opened this issue May 24, 2023 · 0 comments
Open

rolling Fix merging conflict #84

fmrico opened this issue May 24, 2023 · 0 comments
Labels
automatic-sync-merge

Comments

@fmrico
Copy link

fmrico commented May 24, 2023

Please resolve conflicts in next files:
source/Contact.rst
source/The-ROS2-Project/Contributing/Build-Farms.rst

Complete message:
Auto-merging Makefile
Auto-merging conf.py
Auto-merging source/Contact.rst
CONFLICT (content): Merge conflict in source/Contact.rst
Auto-merging source/The-ROS2-Project/Contributing/Build-Farms.rst
CONFLICT (content): Merge conflict in source/The-ROS2-Project/Contributing/Build-Farms.rst
Automatic merge failed; fix conflicts and then commit the result.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
automatic-sync-merge
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@fmrico