Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Semantics in merge #3132

Open
Chemin1 opened this issue Oct 29, 2019 · 3 comments
Assignees

Comments

@Chemin1
Copy link
Contributor

@Chemin1 Chemin1 commented Oct 29, 2019

Merging should take into account semantics like the following.

  • floats 0.00 == 0.0000 == 0.0000000
  • booleans yes == true == 1

To do so the type plugin must be improved.

@Chemin1 Chemin1 self-assigned this Oct 29, 2019
@Chemin1 Chemin1 added this to To do in Improve 3-way merge via automation Oct 29, 2019
@markus2330

This comment has been minimized.

Copy link
Contributor

@markus2330 markus2330 commented Oct 30, 2019

Thank you for creating this issue!

Btw. it is good if we can get rid of the name "cmerge" as fast as possible (and use "merge" everywhere).

It should be enough if you fix the semantic equality once in the type plugin. Then it should not be needed to have several fixes in json/toml/ini.

@Chemin1

This comment has been minimized.

Copy link
Contributor Author

@Chemin1 Chemin1 commented Oct 30, 2019

Btw. it is good if we can get rid of the name "cmerge" as fast as possible (and use "merge" everywhere).

I thought that we could change this as soon as we remove the old merge

@markus2330 markus2330 changed the title Semantics in cmerge Semantics in merge Oct 30, 2019
@markus2330

This comment has been minimized.

Copy link
Contributor

@markus2330 markus2330 commented Oct 30, 2019

Yes, of course. I was referring to the title of the issue.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
2 participants
You can’t perform that action at this time.