[squeak-dev] MCMergeBrowser has broken diffs
marcel.taeumel at hpi.de
Mon Jan 24 09:02:25 UTC 2022
Hi Eliot --
No worries. Do you have a quick idea on what might have caused the confusion? Could the UI be more specific/explanatory in some regard?
Am 21.01.2022 01:55:30 schrieb Eliot Miranda <eliot.miranda at gmail.com>:
Ignore me. I was confused between a modification and a deletion. Sorry for the noise.
On Thu, Jan 20, 2022 at 4:31 PM Eliot Miranda <eliot.miranda at gmail.com [mailto:eliot.miranda at gmail.com]> wrote:
I'm merging a VMMaker.oscog commit into an image with an experiment in progress. Two methods are hence in conflict. In the MCMergeBrowser these two methods show only the in-image variant, not the diff of the in-image and incoming methods, as was previously (and must be) the case. This is after ========== Update of trunk completed: 21017 -> 21069 ==========
-------------- next part --------------
An HTML attachment was scrubbed...
More information about the Squeak-dev