On Sun, Nov 09, 2008 at 03:19:57PM -0500, Caleb Cushing wrote: > > I'm not sure a 'conflict' is what you want, based on what you say below; > > rather, it seems you simply want to force a 'merge commit', i.e. a commit with > > multiple parents. > > > > > git merge --no-ff ? > > > I tried that but I don't see that it's any different than a fast > forward in this scenario. Actually I don't see any difference between > it and a fast-forward. Look at the results of 'git merge' and 'git merge --no-ff' in gitk. Or, compare the resultant sha1 for the two commit objects. Or, look at 'git log' of the resulting commit objects, and look for a 'Merge:' line. Deskin Miller -- 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
