Replies: 2 comments
-
|
Stash has a git-merge implementation that's based on Dulwich, but I have never used it. See https://github.com/ywangd/stash/blob/master/lib/git/git-merge.py The other alternative is to invoke C Git using subprocess. |
Beta Was this translation helpful? Give feedback.
0 replies
-
|
FWIW merging is now properly supported. |
Beta Was this translation helpful? Give feedback.
0 replies
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Uh oh!
There was an error while loading. Please reload this page.
-
Is there any temporary workaround we can use to achieve merging while official support for merging is being worked out?
Related to #452
Beta Was this translation helpful? Give feedback.
All reactions