Unresolved getters for git_merge_driver_source struct were added#4153
Closed
gumenikav wants to merge 2 commits intolibgit2:masterlibgit2/libgit2:masterfrom
gumenikav:merge_driver_source_infogumenikav/libgit2:merge_driver_source_infoCopy head branch name to clipboard
Closed
Unresolved getters for git_merge_driver_source struct were added#4153gumenikav wants to merge 2 commits intolibgit2:masterlibgit2/libgit2:masterfrom gumenikav:merge_driver_source_infogumenikav/libgit2:merge_driver_source_infoCopy head branch name to clipboard
gumenikav wants to merge 2 commits intolibgit2:masterlibgit2/libgit2:masterfrom
gumenikav:merge_driver_source_infogumenikav/libgit2:merge_driver_source_infoCopy head branch name to clipboard
Conversation
pks-t
requested changes
Mar 14, 2017
Member
pks-t
left a comment
There was a problem hiding this comment.
Thanks for this, the implementation is obviously correct. Could you please just remove the single docstring in merge_driver.c?
src/merge_driver.c
Outdated
|
|
||
| static void git_merge_driver_global_shutdown(void); | ||
|
|
||
| /** Get the repository that the source data is coming from. */ |
Member
There was a problem hiding this comment.
This docstring is already part of merge_driver.h.
Author
|
No problem. I removed docstring. |
Member
|
I've squashed your two commits together and manually merged it via 8051b47. Thanks for your work! |
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
2 participants
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.
Unresolved getters for git_merge_driver_source struct were added: