* Testing for a merge conflict without a working copy
@ 2010-09-21 14:45 Joshua Jensen
2010-09-21 15:02 ` Enrico Weigelt
0 siblings, 1 reply; 2+ messages in thread
From: Joshua Jensen @ 2010-09-21 14:45 UTC (permalink / raw
To: git@vger.kernel.org
If I simply want to determine whether a merge would conflict, is there
a way to do it without a working copy?
Thanks!
Josh
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: Testing for a merge conflict without a working copy
2010-09-21 14:45 Testing for a merge conflict without a working copy Joshua Jensen
@ 2010-09-21 15:02 ` Enrico Weigelt
0 siblings, 0 replies; 2+ messages in thread
From: Enrico Weigelt @ 2010-09-21 15:02 UTC (permalink / raw
To: git@vger.kernel.org
* Joshua Jensen <jjensen@workspacewhiz.com> wrote:
> If I simply want to determine whether a merge would conflict, is there
> a way to do it without a working copy?
hmm, you could do it in an temporary working copy (see --work-dir).
cu
--
----------------------------------------------------------------------
Enrico Weigelt, metux IT service -- http://www.metux.de/
phone: +49 36207 519931 email: weigelt@metux.de
mobile: +49 151 27565287 icq: 210169427 skype: nekrad666
----------------------------------------------------------------------
Embedded-Linux / Portierung / Opensource-QM / Verteilte Systeme
----------------------------------------------------------------------
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-09-24 10:44 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-21 14:45 Testing for a merge conflict without a working copy Joshua Jensen
2010-09-21 15:02 ` Enrico Weigelt
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).