Add docs for getting stage number #22645
Merged
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
Jul 1, 2017
base/libgit2/index.jl
Outdated
| In such a case, the various stage numbers on an `IndexEntry` describe which side(s) | ||
| of the conflict the current state of the file belongs to. Stage `0` is the state | ||
| before the attempted merge, stage `1` is the changes which have been made locally, | ||
| stages `2` and larger for changes from other branches (for instance, in the case |
ararslan
approved these changes
Jul 1, 2017
tkelman
reviewed
Jul 1, 2017
base/libgit2/index.jl
Outdated
| of the conflict the current state of the file belongs to. Stage `0` is the state | ||
| before the attempted merge, stage `1` is the changes which have been made locally, | ||
| stages `2` and larger are for changes from other branches (for instance, in the case | ||
| of a multi-branch "octopus" merge, stages `2`, `3`, and `4` might be used.) |
There was a problem hiding this comment.
would make a tiny bit more sense with the period outside the paren I think
tkelman
approved these changes
Jul 1, 2017
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.
No description provided.