On Sat, Apr 16, 2011 at 12:45:12AM +0200, D. A. van Delft wrote: > Point is, I have found a scenario where sometimes git fails on > a specific merge. > Each time I start with the same identical git repository > (archived once and restored each time before a run) and run > the same fixed series of rebases and merges on it. Once in a > while it fails with a merge conflict, sometimes at first try, > sometimes after 10+ times. I have a canned set of testcases > which reproduces this behaviour. I have also narrowed it down > somewhat on how to work around, or prevent it from occurring. > > However, given that it doesn't always fail or succeed, is > unexpected. Yeah, git should generally be deterministic. Can you show us your test case? -Peff -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html