As nobody knew an answer, so I started trying rebase strategies (-s, -X
options), one by one. Using 'git rebase -s recursive -X ours ...' was the
only one which did something useful for this self-rebase and also worked
with a mangeable set of conflicts (only ones including a file deletion), so
On 2017-05-02, at 10:22 AM, m...@jump-ing.de wrote:
>
> As nobody knew an answer, so I started trying rebase strategies (-s, -X
> options), one by one. Using 'git rebase -s recursive -X ours ...' was the
> only one which did something useful for this self-rebase and also worked with
> a mange
Hi @mah,
I think you may have had expectations which were too high. Git can not do
magic.
The problem of product branches that divereged a long while ago is not new.
Even when the two product teams claim that their respective code bases have
converged they are rarely anywhere near each other
Am Dienstag, 2. Mai 2017 19:30:33 UTC+2 schrieb Michael Gersten:
>
>
> On 2017-05-02, at 10:22 AM, m...@jump-ing.de wrote:
>
> Now I have a branch with 4700 commits on it, but zero merges. Diff melted
> down to 3800 lines. That's something I can work with.
>
> Go home message: merges are evil!
Am Dienstag, 2. Mai 2017 21:07:18 UTC+2 schrieb Philip Oakley:
>
>
> I think you may have had expectations which were too high. Git can not do
> magic.
>
All I'm asking for is to replay the already recorded history. Shouldn't
require magic.
> I think your project had two lines of develop
