{"thread":{"id":"25185","subject":"Testing for a merge conflict without a working copy","startedAt":"2010-09-21T14:45:16Z","lastAt":"2010-09-21T15:02:17Z","messageCount":2,"participants":["Joshua Jensen","Enrico Weigelt"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"151217","messageId":"4C98C4FC.1080904@workspacewhiz.com","threadId":"25185","inReplyTo":null,"subject":"Testing for a merge conflict without a working copy","fromName":"Joshua Jensen","fromEmail":"jjensen@workspacewhiz.com","sentAt":"2010-09-21T14:45:16Z","receivedAt":"2010-09-21T14:45:16Z","isPatch":false,"sender":{"key":"jjensen@workspacewhiz.com","avatar":"https://avatars.githubusercontent.com/u/111687?v=4"},"body":"  If I simply want to determine whether a merge would conflict, is there \na way to do it without a working copy?\n\nThanks!\n\nJosh\n"},{"id":"151462","messageId":"20100921150217.GB14711@nibiru.local","threadId":"25185","inReplyTo":"4C98C4FC.1080904@workspacewhiz.com","subject":"Re: Testing for a merge conflict without a working copy","fromName":"Enrico Weigelt","fromEmail":"weigelt@metux.de","sentAt":"2010-09-21T15:02:17Z","receivedAt":"2010-09-21T15:02:17Z","isPatch":false,"sender":{"key":"weigelt@metux.de","avatar":null},"body":"* Joshua Jensen <jjensen@workspacewhiz.com> wrote:\n>  If I simply want to determine whether a merge would conflict, is there \n> a way to do it without a working copy?\n\nhmm, you could do it in an temporary working copy (see --work-dir).\n\n\ncu\n-- \n----------------------------------------------------------------------\n Enrico Weigelt, metux IT service -- http://www.metux.de/\n\n phone:  +49 36207 519931  email: weigelt@metux.de\n mobile: +49 151 27565287  icq:   210169427         skype: nekrad666\n----------------------------------------------------------------------\n Embedded-Linux / Portierung / Opensource-QM / Verteilte Systeme\n----------------------------------------------------------------------\n"}]}