> I'm not sure a 'conflict' is what you want, based on what you say below;
quoted text
>  rather, it seems you simply want to force a 'merge commit', i.e. a commit with
>  multiple parents.

quoted text
>
> 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.
-- 
Caleb Cushing
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html