Basic file merging #672
Open
Basic file merging #672
Conversation
This file contains 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
tiennou
force-pushed
the
feature/file-merging
branch
from
a481f8e to
e0e103f
Compare
This fixes the file path in the diff always being `file.txt`, as well as (I suspect) taking into account what's in the index instead of going straight to the ODB.
tiennou
force-pushed
the
feature/file-merging
branch
from
e0e103f to
e0103df
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.
This adds a wrapper for the simple
git_merge_file&git_merge_file_from_index.This is somewhat a leftover from #664, because the implementation was already available in libgit2 as the latter, and thus misses nicer things (like filenames in conflict markers).
I'd like to get that in ASAP, so I can update libgit2 and make a release from that, and that API is in my way 😉.