Smalltalk › Squeak › Squeak - Dev

False merge conflicts

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

5 messages Options

Christoph Thiede

False merge conflicts

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:

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

Best,

Christoph

Carpe Squeak!

Christoph Thiede

Re: False merge conflicts

Nevermind, this one was a false alert, though it took me way too much to
realize this. In my image, I already had recategorized this method, but in
the Trunk, it is still uncategorized. Thus the merge conflict. :-)

Best,
Christoph

-----
Carpe Squeak!
--
Sent from: http://forum.world.st/Squeak-Dev-f45488.html

Carpe Squeak!

Nicolas Cellier

Re: False merge conflicts

>
> Nevermind, this one was a false alert, though it took me way too much to
> realize this. In my image, I already had recategorized this method, but in
> the Trunk, it is still uncategorized. Thus the merge conflict. :-)
>
> Best,
> Christoph
>
>
>
> -----
> Carpe Squeak!
> --
> Sent from: http://forum.world.st/Squeak-Dev-f45488.html
>

Christoph Thiede

Re: False merge conflicts

Hi Nicolas,

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. :-)

> A pity that I didn't see that those methods were miss-categorized, maybe it's not visually obvious when using message tracer...

Hmm, would it be a good idea to highlight the unclassified category in browsers using bold/italic font?

I've also been thinking for some time about displaying a small kind of dashboard in the SaveVersionDialog which could things such as: "slips" (halts/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 ...

Best,

Christoph

Von: Squeak-dev <[hidden email]> im Auftrag von Nicolas Cellier <[hidden email]>
Gesendet: Samstag, 1. Mai 2021 16:57:51
An: The general-purpose Squeak developers list
Betreff: Re: [squeak-dev] False merge conflicts

Hi Christoph,
yes we consider meta information like categories as editions and thus
conflicts, and IMO it's a good thing because categories bring a bit of
added value that we don't want to lose.
A pity that I didn't see that those methods were miss-categorized,
maybe it's not visually obvious when using message tracer...

Le sam. 1 mai 2021 à 14:00, Christoph Thiede
<[hidden email]> a écrit :
>
> Nevermind, this one was a false alert, though it took me way too much to
> realize this. In my image, I already had recategorized this method, but in
> the Trunk, it is still uncategorized. Thus the merge conflict. :-)
>
> Best,
> Christoph
>
>
>
> -----
> Carpe Squeak!
> --
> Sent from: http://forum.world.st/Squeak-Dev-f45488.html
>

Carpe Squeak!

Jakob Reschke

Re: False merge conflicts

Am Sa., 1. Mai 2021 um 18:05 Uhr schrieb Thiede, Christoph
<[hidden email]>:
>
> Hmm, would it be a good idea to highlight the unclassified category in browsers using bold/italic font?
>

Put an exclamation sign on it, like the green and red bubbles for test
methods. Or one of the flag icons (from flag:, halt, break) to signal
unfinished work.

>
> I've also been thinking for some time about displaying a small kind of dashboard in the SaveVersionDialog which could things such as: "slips" (halts/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 ...
>

Would this be possible as an extension package that everyone can load
if they want it?