Skip to content

Merge conflict#60

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
Merged
JohanMabille merged 4 commits into from
Dec 3, 2025
Merged

Merge conflict #60

JohanMabille merged 4 commits into from
Dec 3, 2025

Conversation

@SandrineP
Copy link
Collaborator

@SandrinePSandrineP commented Dec 2, 2025

Adds merge with conflicts as well as the --abort and --continue flags.
Replace #57

JohanMabille
JohanMabille requested changes Dec 2, 2025
View reviewed changes
@JohanMabilleJohanMabille merged commit 72a2fc2 into QuantStack:mainDec 3, 2025
1 check passed
@SandrinePSandrineP deleted the merge_conflict_2 branch December 3, 2025 13:54
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@JohanMabilleJohanMabilleJohanMabille approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@SandrineP@JohanMabille