Enhance merge support #678
Open
Conversation
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
This ensure the working copy is in a sane state for subsequent tests
This is a cosmetic-only change for diff clarity
This makes us perform only one merge operation, instead of first merging trees, then merging commits to get the merge conflicts in the workdir.
tiennou
force-pushed
the
fix/merge-support
branch
from
2a7bf36 to
78783db
Compare
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.
Our current merge code (which is only used when pulling at the moment), had a few issues with consistency : it does not respect the pulled branch merge preference. It also doesn't use the correct "style" of commit messages, because its annotated commits weren't created from the correct objects.
This PR adds support for annotated commit (though there's no public API that make use of them yet), somewhat streamlines the steps to take in order to perform a merge operation (so a future merge OID API has less work to do), and adds a way to commit a repository's pending merge (after conflicts are resolved).