Skip to content

This issue was moved to a discussion.

You can continue the conversation there. Go to discussion →

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Any workarounds for merging? #682

Closed
sheluchin opened this issue Jan 24, 2019 · 1 comment
Closed

Any workarounds for merging? #682

sheluchin opened this issue Jan 24, 2019 · 1 comment

Comments

@sheluchin
Copy link

Is there any temporary workaround we can use to achieve merging while official support for merging is being worked out?

Related to #452
@jelmer
Copy link
Owner

jelmer commented Jan 25, 2019

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.

@jelmer jelmer closed this as completed Jan 25, 2019
Repository owner locked and limited conversation to collaborators Feb 17, 2022
@jelmer jelmer converted this issue into discussion #937 Feb 17, 2022

This issue was moved to a discussion.

You can continue the conversation there. Go to discussion →

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@jelmer @sheluchin