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

--

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
git merge --no-ff ?
Hope that helps,

Deskin Miller

--

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.

--

Caleb Cushing

--

If you want to be given a chance to edit the result before the merge

commit, you probably want 'git merge --no-commit'.
-Brett

--

That's the closest to what I need to do... unfortunately it's not what

I need to do. Apparently I'll have to do a vimdiff outside of git

since git doesn't appear to be capable of doing what I need it to do.
--

Caleb Cushing

--

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

--