merge/rebase support

[Margar Simonyan]

Hello,

Are the plans to support merge/rebase operations? 

Best regards,

Margar 

[Jelmer Vernooij]

Hi Margar,

Merge support is planned, but I need to sit down for a couple of days to properly design and implement it.

Cheers,

Jelmer

--
You received this message because you are subscribed to the Google Groups "dulwich-discuss" group.
To unsubscribe from this group and stop receiving emails from it, send an email to dulwich-discu...@googlegroups.com.
To view this discussion on the web, visit https://groups.google.com/d/msgid/dulwich-discuss/0c9a5821-367d-42df-88ac-bfedeb308b53%40googlegroups.com.

[Łukasz Langa]

Keeping fingers crossed for this!

An interesting use case: the Pythonista app for iOS is a fantastic integrated environment that effectively allows scripting an iPhone or iPad. Support for merges and fast-forwards in Dulwich is the missing piece that would allow Pythonista to synchronize code and data seamlessly using Git, without leaving the app.

The Pythonista app has a small but fanatic following, they even implemented a bash-like terminal environment for it and this has a "git" tool that supports merges:

- https://github.com/ywangd/stash/blob/master/lib/git/git-merge.py

If you'd like to "think aloud" about the design you have in mind for this, you might get some help with this :-)

- Ł

 

On Tuesday, December 31, 2019 at 5:08:23 PM UTC+1, Jelmer Vernooij wrote:

Hi Margar,

Merge support is planned, but I need to sit down for a couple of days to properly design and implement it.

Cheers,

Jelmer

On Mon, Dec 30, 2019, 9:14 PM Margar Simonyan <margar....@gmail.com> wrote:

Hello,

Are the plans to support merge/rebase operations? 

Best regards,

Margar 

--
You received this message because you are subscribed to the Google Groups "dulwich-discuss" group.

To unsubscribe from this group and stop receiving emails from it, send an email to dulwich...@googlegroups.com.

[Jelmer Vernooij]

FWIW There is some work ongoing to add merge support in the merge-1 and merge-base branches. I'm hoping that the upcoming 0.20.0 will have basic merge support.

To unsubscribe from this group and stop receiving emails from it, send an email to dulwich-discu...@googlegroups.com.
To view this discussion on the web, visit https://groups.google.com/d/msgid/dulwich-discuss/621c973d-86ce-49cd-8200-4df586e98b06%40googlegroups.com.