<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<meta name="Generator" content="Microsoft Exchange Server">
<!-- converted from text --><style><!-- .EmailQuote { margin-left: 1pt; padding-left: 4pt; border-left: #800000 2px solid; } --></style>
</head>
<body>
<meta content="text/html; charset=UTF-8">
<style type="text/css" style="">
<!--
p
{margin-top:0;
margin-bottom:0}
-->
</style>
<div dir="ltr">
<div id="x_divtagdefaultwrapper" dir="ltr" style="font-size:12pt; color:#000000; font-family:Calibri,Helvetica,sans-serif">
<p>Hi Nicolas,</p>
<p><br>
</p>
<p>yes, it's only confusing because we don't have meta information for the author of a recategorization. Even though I see that this would likely be overengineering. :-)</p>
<p><br>
</p>
<p>> <span style="font-size:12pt">A pity that I didn't see that those methods were miss-categorized, </span><span style="font-size:12pt">maybe it's not visually obvious when using message tracer...</span></p>
<div><br>
</div>
<p></p>
<div id="x_Signature">
<div id="x_divtagdefaultwrapper" dir="ltr" style="font-size:12pt; color:rgb(0,0,0); font-family:Calibri,Helvetica,sans-serif,EmojiFont,"Apple Color Emoji","Segoe UI Emoji",NotoColorEmoji,"Segoe UI Symbol","Android Emoji",EmojiSymbols">
<div name="x_divtagdefaultwrapper" style="font-family:Calibri,Arial,Helvetica,sans-serif; font-size:; margin:0">
<div>
<div class="x__rp_T4" id="x_Item.MessagePartBody">
<div class="x__rp_U4 x_ms-font-weight-regular x_ms-font-color-neutralDark x_rpHighlightAllClass x_rpHighlightBodyClass" id="x_Item.MessageUniqueBody" style="font-family:wf_segoe-ui_normal,"Segoe UI","Segoe WP",Tahoma,Arial,sans-serif,serif,EmojiFont">
<div dir="ltr">
<div id="x_divtagdefaultwrapper"><font face="Calibri,Helvetica,sans-serif,EmojiFont,Apple Color Emoji,Segoe UI Emoji,NotoColorEmoji,Segoe UI Symbol,Android Emoji,EmojiSymbols">
<div id="x_Signature">
<div style="margin:0px"><font style="font-family:Calibri,Arial,Helvetica,sans-serif,serif,EmojiFont"></font></div>
</div>
</font></div>
</div>
</div>
</div>
<div class="x__rp_T4" id="x_Item.MessagePartBody">Hmm, would it be a good idea to highlight the unclassified category in browsers using bold/italic font?</div>
<div class="x__rp_T4" id="x_Item.MessagePartBody"><br>
</div>
<div class="x__rp_T4" id="x_Item.MessagePartBody">I've also been thinking for some time about displaying a small kind of dashboard in the SaveVersionDialog which could things such as: "slips" (h<span style="font-size:12pt">alts/flags/Transcript) in code, uncategorized
methods, and maybe even more things such as linter results (SwaLint) or test results. But this might be a performance problem and I guess that not everyone would like it ...</span></div>
<div class="x__rp_T4" id="x_Item.MessagePartBody"><span style="font-size:12pt"><br>
</span></div>
<div class="x__rp_T4" id="x_Item.MessagePartBody"><span style="font-size:12pt">Best,</span></div>
<div class="x__rp_T4" id="x_Item.MessagePartBody"><span style="font-size:12pt">Christoph</span></div>
</div>
<div><font size="2" color="#808080"></font></div>
</div>
</div>
</div>
</div>
<hr tabindex="-1" style="display:inline-block; width:98%">
<div id="x_divRplyFwdMsg" dir="ltr"><font face="Calibri, sans-serif" color="#000000" style="font-size:11pt"><b>Von:</b> Squeak-dev <squeak-dev-bounces@lists.squeakfoundation.org> im Auftrag von Nicolas Cellier <nicolas.cellier.aka.nice@gmail.com><br>
<b>Gesendet:</b> Samstag, 1. Mai 2021 16:57:51<br>
<b>An:</b> The general-purpose Squeak developers list<br>
<b>Betreff:</b> Re: [squeak-dev] False merge conflicts</font>
<div> </div>
</div>
</div>
<font size="2"><span style="font-size:10pt;">
<div class="PlainText">Hi Christoph,<br>
yes we consider meta information like categories as editions and thus<br>
conflicts, and IMO it's a good thing because categories bring a bit of<br>
added value that we don't want to lose.<br>
A pity that I didn't see that those methods were miss-categorized,<br>
maybe it's not visually obvious when using message tracer...<br>
<br>
Le sam. 1 mai 2021 à 14:00, Christoph Thiede<br>
<christoph.thiede@student.hpi.uni-potsdam.de> a écrit :<br>
><br>
> Nevermind, this one was a false alert, though it took me way too much to<br>
> realize this. In my image, I already had recategorized this method, but in<br>
> the Trunk, it is still uncategorized. Thus the merge conflict. :-)<br>
><br>
> Best,<br>
> Christoph<br>
><br>
><br>
><br>
> -----<br>
> Carpe Squeak!<br>
> --<br>
> Sent from: <a href="http://forum.world.st/Squeak-Dev-f45488.html">http://forum.world.st/Squeak-Dev-f45488.html</a><br>
><br>
<br>
</div>
</span></font>
</body>
</html>