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 development which forked and then > ran independently. The two forks each had their own branch-merge processes > in place (so each line has merges on it, but no cross merges between the > two forks). [...] This assumes you want to see a progressive 'zipping > together' of the two development streams (picking the best of each). > Yes, this describes it perfectly, thank you. > The Mikado method  is one approach to avoiding a merge hell of trying > to do everything at once. > Here's another method I use for several years already, with great success: https://github.com/Traumflug/Teacup_Firmware/issues/81 Does not require to read a book, but does require a branch to be rebase-able. Markus -- 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.