Merge conflict - #60
Merged
JohanMabille merged 4 commits intoDec 3, 2025
Merged
JohanMabille merged 4 commits into
JohanMabille merged 4 commits into
Conversation
Copy link
Copy Markdown
Collaborator
Sorry, something went wrong.
JohanMabille
requested changes
Dec 2, 2025
Comment thread
src/subcommand/merge_subcommand.cpp
Outdated
Comment thread
src/subcommand/merge_subcommand.cpp
Outdated
Comment thread
src/subcommand/merge_subcommand.cpp
Outdated
Comment thread
src/subcommand/merge_subcommand.cpp
Outdated
Comment thread
src/subcommand/merge_subcommand.cpp
Outdated
Comment thread
src/subcommand/merge_subcommand.cpp
Comment thread
src/subcommand/merge_subcommand.cpp
Outdated
Comment thread
src/subcommand/merge_subcommand.hpp
Outdated
JohanMabille
approved these changes
Dec 3, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Adds merge with conflicts as well as the --abort and --continue flags.
Replace #57