Hi all,


this is not the first time I am receiving a merge conflict resolution window while updating my image even though there is not a real merge conflict:


[cid:cdf93b35-01eb-4934-8ba1-bfc8bef8a86d]


Did anyone else of you experience similar issues in the past? Is there something wrong with the detection of merge conflicts?


Best,

Christoph

<http://www.hpi.de/>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.squeakfoundation.org/pipermail/squeak-dev/attachments/20210430/3e403551/attachment.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: pastedImage.png
Type: image/png
Size: 28429 bytes
Desc: pastedImage.png
URL: <http://lists.squeakfoundation.org/pipermail/squeak-dev/attachments/20210430/3e403551/attachment.png>