stash apply: support reinstate_index and skip_conflicts #101
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
pmrowla
force-pushed
the
stash-improvements
branch
from
ce3a9f8
to
76a84b7
Compare
pmrowla
commented
Jun 17, 2022
Comment on lines
+483
to
+484
| if skip_conflicts: | ||
| strategy |= GIT_CHECKOUT_ALLOW_CONFLICTS |
There was a problem hiding this comment.
Note that this is pygit specific right now because there is no CGit git stash apply flag that gives this equivalent behavior.
libgit2 provides it since it's useful for programmatic reasons (where you need to automate everything vs being able to do interactive 3-way merge conflict resolutions with CLI git)
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.
Adds support for
--indexand force-applying instash applyprereq for iterative/dvc#6930