Add Merge Comparison Ignore Options
1348
Views
21
Comments
New
Collaboration

Hi,

It would be awesome to have options to ignore some differences when merging oml files.

Some of the Ignore Options could be:

  • Ignore Position Changes
  • Ignore Case and Spacing (Could be for Assign names of comments)
  • Ignore White Spaces (for JS blocks or any text area like containers)


Regards,

Carlos Ardiles

Changed the category to
Collaboration
Merged this idea with 'Ignore position changed in merge' (created on 04 Nov 2019 14:59:28 by MFR)

Add a filter in merge to ignore position changed



This comment was:
- originally posted on idea 'Ignore position changed in merge' (created on 04 Nov 2019 by MFR)
- merged to idea 'Add Merge Comparison Ignore Options' on 28 Jan 2021 05:42:27 by Daniël Kuhlmann
Changed the category to
Collaboration


This comment was:
- originally posted on idea 'Ignore position changed in merge' (created on 04 Nov 2019 by MFR)
- merged to idea 'Add Merge Comparison Ignore Options' on 28 Jan 2021 05:42:27 by Daniël Kuhlmann

I believe this idea (from 4 Nov. 2019) should be merged/combined with this one:

"Show node position changes in a different color" (from 20 Oct. 2019)

https://www.outsystems.com/ideas/7453/show-node-position-changes-in-a-different-color

They relate to the same thing, the Merge functionality, basically requesting to have an option to "ignore whitespaces" in the merge, and if not to ignore then to color them differently than the other changes.

--Tiago Bernardo



This comment was:
- originally posted on idea 'Ignore position changed in merge' (created on 04 Nov 2019 by MFR)
- merged to idea 'Add Merge Comparison Ignore Options' on 28 Jan 2021 05:42:27 by Daniël Kuhlmann
Merged this idea with 'Merge: Possibility to ignore "position changes" and other non-relevant changes' (created on 27 Jan 2021 14:37:44 by Tiago Bernardo)

Hi!

When doing Merge/Compare it would be helpful to be able to set to ignore changes that are not relevant, like just position changes.

This would be more or less similar to what is provided in other tools for version control, as "ignore whitespace changes".

--Tiago Bernardo



This comment was:
- originally posted on idea 'Merge: Possibility to ignore "position changes" and other non-relevant changes' (created on 27 Jan 2021 by Tiago Bernardo)
- merged to idea 'Add Merge Comparison Ignore Options' on 28 Jan 2021 05:43:29 by Daniël Kuhlmann

Hi Tiago, great Idea but I will merge it in the one that is already there since 2019.



This comment was:
- originally posted on idea 'Merge: Possibility to ignore "position changes" and other non-relevant changes' (created on 27 Jan 2021 by Tiago Bernardo)
- merged to idea 'Add Merge Comparison Ignore Options' on 28 Jan 2021 05:43:29 by Daniël Kuhlmann
Merged this idea with 'Option to ignore 'The position of the node has changed' when comparing versions' (created on 14 May 2021 07:09:47 by Hans)

When doing code reviews, I want to compare the previous version with the new version containing the changes. 

I first want to focus on code reviewing the functionality and don't want to be distracted by a lot of 'The position of the node has changed' messages.

I would be convenient to have an option to turn those messages off and on.

regards Hans



This comment was:
- originally posted on idea 'Option to ignore 'The position of the node has changed' when comparing versions' (created on 14 May 2021 by Hans)
- merged to idea 'Add Merge Comparison Ignore Options' on 24 Jun 2021 04:49:09 by Justin James

This would be a really good improvement for regular development as well.

In the case of regular development where you need to merge versions, it should also be necessary to define which node position should prevail (previous or new version?). 



This comment was:
- originally posted on idea 'Option to ignore 'The position of the node has changed' when comparing versions' (created on 14 May 2021 by Hans)
- merged to idea 'Add Merge Comparison Ignore Options' on 24 Jun 2021 04:49:09 by Justin James

Good suggestion! 

Merging can take a while when there a lot of screens where only the position of a few nodes was changed. This would make merging versions much faster.



This comment was:
- originally posted on idea 'Option to ignore 'The position of the node has changed' when comparing versions' (created on 14 May 2021 by Hans)
- merged to idea 'Add Merge Comparison Ignore Options' on 24 Jun 2021 04:49:09 by Justin James

Such a great idea! 

Sometimes we have so many differences that are only "The position of the node has changed" and this would help to understand the real differences in code.



This comment was:
- originally posted on idea 'Option to ignore 'The position of the node has changed' when comparing versions' (created on 14 May 2021 by Hans)
- merged to idea 'Add Merge Comparison Ignore Options' on 24 Jun 2021 04:49:09 by Justin James

This is a must have to do proper code comparison.
It would save us so much time: not only on merging but especially when doing code reviews.

Who is seeing any value in detecting differences in the position of elements?

Consider this: in "high code" you would get differences only on added lines, not on subsequent lines moved down - even with option "Ignore white space" off.



This comment was:
- originally posted on idea 'Option to ignore 'The position of the node has changed' when comparing versions' (created on 14 May 2021 by Hans)
- merged to idea 'Add Merge Comparison Ignore Options' on 24 Jun 2021 04:49:09 by Justin James

Good remark according to high code Ahron.



This comment was:
- originally posted on idea 'Option to ignore 'The position of the node has changed' when comparing versions' (created on 14 May 2021 by Hans)
- merged to idea 'Add Merge Comparison Ignore Options' on 24 Jun 2021 04:49:09 by Justin James

Great Idea!
Also I would like to add ignoring updated reference without impact to usage place



This comment was:
- originally posted on idea 'Option to ignore 'The position of the node has changed' when comparing versions' (created on 14 May 2021 by Hans)
- merged to idea 'Add Merge Comparison Ignore Options' on 24 Jun 2021 04:49:09 by Justin James
Merged this idea with 'Merge tool should ignore cosmetic changes like change position, updated reference without impact to usage place' (created on 22 Jun 2021 06:26:20 by Valerij Gerasimov)

This comment was:
- originally posted on idea 'Option to ignore 'The position of the node has changed' when comparing versions' (created on 14 May 2021 by Hans)
- merged to idea 'Add Merge Comparison Ignore Options' on 24 Jun 2021 04:49:09 by Justin James

Many cosmetics changes hide real changes in the logic making comparing more difficult. If cosmetic changes are important in some cases there can be a setting flag to switch  them on/off.




This comment was:
- originally posted on idea 'Merge tool should ignore cosmetic changes like change position, updated reference without impact to usage place' (created on 22 Jun 2021 by Valerij Gerasimov)
- merged to idea 'Option to ignore 'The position of the node has changed' when comparing versions' on 24 Jun 2021 04:48:35 by Justin James


This comment was:
- originally posted on idea 'Option to ignore 'The position of the node has changed' when comparing versions' (created on 14 May 2021 by Hans)
- merged to idea 'Add Merge Comparison Ignore Options' on 24 Jun 2021 04:49:09 by Justin James

see https://www.outsystems.com/ideas/10746/option-to-ignore-the-position-of-the-node-has-changed-when-comparing-versions/



This comment was:
- originally posted on idea 'Merge tool should ignore cosmetic changes like change position, updated reference without impact to usage place' (created on 22 Jun 2021 by Valerij Gerasimov)
- merged to idea 'Option to ignore 'The position of the node has changed' when comparing versions' on 24 Jun 2021 04:48:35 by Justin James


This comment was:
- originally posted on idea 'Option to ignore 'The position of the node has changed' when comparing versions' (created on 14 May 2021 by Hans)
- merged to idea 'Add Merge Comparison Ignore Options' on 24 Jun 2021 04:49:09 by Justin James

Thank you Hans, I didn't find it before creating mine.



This comment was:
- originally posted on idea 'Merge tool should ignore cosmetic changes like change position, updated reference without impact to usage place' (created on 22 Jun 2021 by Valerij Gerasimov)
- merged to idea 'Option to ignore 'The position of the node has changed' when comparing versions' on 24 Jun 2021 04:48:35 by Justin James


This comment was:
- originally posted on idea 'Option to ignore 'The position of the node has changed' when comparing versions' (created on 14 May 2021 by Hans)
- merged to idea 'Add Merge Comparison Ignore Options' on 24 Jun 2021 04:49:09 by Justin James