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 mangeable set of conflicts (only ones including a file deletion), so I got > away with resolving some 30 conflicts with 'git rm ...'. 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!
Merges should not be evil. Something really odd was going on here. A better take-home message should be about how to prevent this from happening in the future. What I don't understand, exactly, is "a branch with 4700 commits but zero merges". I thought that merging was the goal here? > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/d/optout. --- Entertaining minecraft videos http://YouTube.com/keybounce -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
