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

Fix conflict main-develop #2514

Merged
merged 16 commits into from Dec 2, 2022
Merged

Fix conflict main-develop #2514

merged 16 commits into from Dec 2, 2022

Conversation

brosaplanella
Copy link
Sponsor Member

Description

Fix conflict between main and develop to allow merging #2497

@Saransh-cpp
Copy link
Member

Saransh-cpp commented Dec 2, 2022 •
edited

Re-running the failed pre_job. See fkirc/skip-duplicate-actions#301 (comment).

Saransh-cpp
Saransh-cpp approved these changes Dec 2, 2022
View reviewed changes
Copy link
Member

@Saransh-cpp Saransh-cpp left a comment •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, @brosaplanella! (pre_job looks fixed too!)

@brosaplanella brosaplanella merged commit 0229260 into develop Dec 2, 2022
@brosaplanella brosaplanella deleted the fix-conflict-main-develop branch December 2, 2022 12:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Saransh-cpp Saransh-cpp Saransh-cpp approved these changes

@valentinsulzer valentinsulzer Awaiting requested review from valentinsulzer

@martinjrobins martinjrobins Awaiting requested review from martinjrobins

@rtimms rtimms Awaiting requested review from rtimms

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@brosaplanella @Saransh-cpp @aabills @valentinsulzer