From: "Caleb Cushing" <xenoterracide@gmail.com>
To: "Constantine Plotnikov" <constantine.plotnikov@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: force a merge conflict
Date: Tue, 11 Nov 2008 12:24:03 -0500 [thread overview]
Message-ID: <81bfc67a0811110924y5ff6a669kee5cb33c92c6046d@mail.gmail.com> (raw)
In-Reply-To: <85647ef50811110914w7e1d36afh23b43b44ba0e2cf3@mail.gmail.com>
> Is not the following option of the merge just for it?
>
> --no-commit
> Perform the merge but pretend the merge failed and do not
> autocommit, to give the user a chance to inspect and further tweak the
> merge result before committing.
yes and no... it doesn't auto-magically allow me to do what a merge
conflict does. which is put together a diff. all it really did was not
commit the auto merge.
as far as --no-ff I'm not saying it commits the same way but I didn't
see any difference in the resulting diffs, which, imho, all that
matters is whether the resulting merged code is correct.
--
Caleb Cushing
prev parent reply other threads:[~2008-11-11 17:25 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
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 [this message]
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=81bfc67a0811110924y5ff6a669kee5cb33c92c6046d@mail.gmail.com \
--to=xenoterracide@gmail.com \
--cc=constantine.plotnikov@gmail.com \
--cc=git@vger.kernel.org \
/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).