From: Deskin Miller <deskinm@umich.edu>
To: Caleb Cushing <xenoterracide@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: force a merge conflict
Date: Sun, 9 Nov 2008 13:39:17 -0500 [thread overview]
Message-ID: <20081109183917.GA18415@euler> (raw)
In-Reply-To: <81bfc67a0811090709s483506c1h6f9cb0f96216ef22@mail.gmail.com>
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
next prev parent reply other threads:[~2008-11-09 18:40 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-09 15:09 force a merge conflict Caleb Cushing
2008-11-09 18:39 ` Deskin Miller [this message]
2008-11-09 20:19 ` Caleb Cushing
2008-11-09 20:35 ` Deskin Miller
2008-11-10 19:11 ` Brett Simmers
2008-11-11 17:10 ` Caleb Cushing
[not found] ` <85647ef50811110914w7e1d36afh23b43b44ba0e2cf3@mail.gmail.com>
2008-11-11 17:24 ` Caleb Cushing
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20081109183917.GA18415@euler \
--to=deskinm@umich.edu \
--cc=git@vger.kernel.org \
--cc=xenoterracide@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).