More docs for merge! #23495
Merged
More docs for merge! #23495
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
kshyatt
added
docs
ararslan
reviewed
Aug 29, 2017
base/libgit2/merge.jl
Outdated
| head_ann = LibGit2.GitAnnotated(repo, "master") | ||
|
|
||
| # merge the branch in | ||
| LibGit2.merge!(repo, [upst_ann]) |
There was a problem hiding this comment.
Is this supposed to reference head_ann as well?
There was a problem hiding this comment.
derp no i c/ped this from the tests
ararslan
approved these changes
Aug 29, 2017
fredrikekre
reviewed
Aug 29, 2017
| @@ -111,6 +111,29 @@ function ffmerge!(repo::GitRepo, ann::GitAnnotated) | |||
| end | |||
|
|
|||
| # Merge changes into current head | |||
There was a problem hiding this comment.
This comment seem a bit superfluous now that we have a complete docstring?
There was a problem hiding this comment.
I think they aren't harming anyone by hanging around. In general I'd rather err on the side of having more context rather than less...
| @@ -126,6 +149,40 @@ end | |||
|
|
|||
| # Internal implementation of merge. | |||
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.
Forgot to add
GitAnnotatedto the devdocs, fixed that too.