Re: Updated Issue 209 - support drop/modified conflict
Hendrik Boom <[email protected]>
| Newsgroups | gmane.comp.version-control.monotone.devel |
|---|---|
| Message-ID | <[email protected]> |
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? -- hendrik