On Sun, Nov 09, 2008 at 10:09:49AM -0500, Caleb Cushing wrote: > is there any way to force a merge conflict? 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. > in this case I have a dev branch and fork branch the fork is a copy of > dev except I committed one of the files from the fork. I need to merge > this file back into dev, but git thinks it's a fast forward, because > it really is for git, in reality it isn't, both files have newer > history than their common ancestry. git merge --no-ff ? Hope that helps, 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
