index: map git_index_conflict_add #1382
Open
Conversation
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
map libgit2's git_index_conflict_add() as Index.add_conflict().
eantoranz
force-pushed
the
git_index_conflict_add
branch
from
0e1538c to
7e00418
Compare
|
Interesting that it failed for macos (and that the feedback already tips that it might be a problem in libgit2). |
eantoranz
commented
Jun 27, 2025
| err = C.git_index_conflict_add( | ||
| self._index, centry_ancestor, centry_ours, centry_theirs | ||
| ) | ||
|
|
There was a problem hiding this comment.
Is there something to do with the centries after using them in git_index_conflict_add()?
|
Reading cffi's documentation, centries will be garbage collected, so there is nothing to do with it. |
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.
map libgit2's
git_index_conflict_add()asIndex.add_conflict().