Re: extracting commits from Elpa to original repo

[Dmitry Gutov <dgutov@yandex.ru>]

Eric Abrahamsen <eric@ericabrahamsen.net> writes:

> I also used the "subtree split" command to create a separate branch
> within Elpa containing only the commits made on "packages/gnorb".
>
> I'd like to get Stefan's patch into my general Gnorb repo, in such a way
> that it doesn't create any conflicts or confusion the next time I pull
> into Elpa. I created a patch for his commit, but it doesn't apply
> cleanly to my other repo, and I suspect that fixing it up so that it
> does will simply defer the mess.

Why doesn't it? But anyway, you should fix it up and push, and then
solve any conflicts that might arise in the next merge.

The 'git subtree push' workflow described in the article you've linked
to can work too, in certain cases, but IIUC it only works well if the
separate repo was originally made from a split (otherwise you risk
pushing the whole elpa history into the external repo).