is there any way to force a merge conflict? there are 2 projects which have basically diverged becoming incompatible, and both have updated since there common ancestry. I'm working slowing on merging them back together. 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. -- Caleb Cushing -- 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
