At Thu, 29 Nov 2012 17:10:04 +0000, Mark Brown wrote:
On Thu, Nov 29, 2012 at 06:05:57PM +0100, Takashi Iwai wrote:
As said, octopus merge of a few branches is fine. It's been done occasionally indeed. But your latest challenge broke the world record in more than double scores. Did you see your tree on gitk? Linus explained that he usually takes a look at gitk after merge, so he'll be certainly amused, too.
Well, that's just a gitk UI problem.
All GUI programs show in that way, as far as I know.
It's an accurate reflection of what's happening.
Yes, and this reveals something ugly really happened. Using gitk (or any other GUI) is a very fundamental workflow for normal developers. We mustn't mess it up.
I don't really have time to go through and generate a bunch of individual merges right now, perhaps tomorrow.
OK, thanks.
Note that there's no guarantee it'll be tomorrow, it may be Sunday.
Alright.
thanks,
Takashi