Join GitHub today
GitHub is home to over 50 million developers working together to host and review code, manage projects, and build software together.
Sign upGitHub is where the world builds software
Millions of developers and companies build, ship, and maintain their software on GitHub — the largest and most advanced development platform in the world.
Add support for git-merge-file #1791
Open
+775
−53
Conversation
- add `git merge-file`static method `Repository.MergeFile()` - supports merging individual files outside a working tree - uses libgit2/git_merge_file native - byte array and file path overloads with options provided
|
It seems like everyone is really busy, but this is the first PR I've ever submitted so I'm open to any feedback. Thanks in advance. |
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.
Add support for git-merge-file (Run a three-way file merge.)
MergeFilemethod onRepositorygit_merge_file