Re: Updated Issue 209 - support drop/modified conflict
Stephen Leake <[email protected]>
| Newsgroups | gmane.comp.version-control.monotone.devel |
|---|---|
| Message-ID | <[email protected]> |
Hendrik Boom <[email protected]> writes: > On Thu, Jun 14, 2012 at 08:06:42AM -0400, Stephen Leake wrote: >> Ethan Blanton <[email protected]> writes: >> >> >> An alternate is to live with the 'ignoring upstream changes due to local >> >> delete' warning in 1.0. >> >> >> >> Why is that not ok? > > How would monotone know which is upstream and which is downstream? You left out too much context; when I asked that question, I though the use case was the 'upstream/downstream' use case, where the answer to your question is clear. -- -- Stephe