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

Fixed XOR usage in the object merge helper to output warnings correctly. #796

Merged
merged 3 commits into from
Aug 12, 2019
Merged

Fixed XOR usage in the object merge helper to output warnings correctly. #796

merged 3 commits into from
Aug 12, 2019

Conversation

DanielRuf
Copy link
Contributor

Description

This PR fixes the XOR (before this the secon value was always the same).
See also http://www.howtocreate.co.uk/xor.html

Type of change

Please add an "x" into the option that is relevant:

  • Bug Fix 🐛 (non-breaking change which fixes an issue)
  • Enhancement 🚀 (non-breaking change which adds functionality)
  • Breaking Change 💥 (fix or feature that would cause existing functionality to not work as expected)
  • Polish 💅 (Just some cleanups)
  • Internal 🏠 Only relates to internal processes.

@SG-Noxoreos SG-Noxoreos added the bug Something isn't working label Aug 9, 2019
@SG-Noxoreos SG-Noxoreos changed the title Use correct XOR syntax Fixed XOR usage in the object merge helper to output warnings correctly. Aug 9, 2019
@DanielRuf
Copy link
Contributor Author

DanielRuf commented Aug 9, 2019

Fixed XOR usage in the object merge helper to output warnings correctly.

Short question, why do you use the past form? Git recommends using imperative form so commits will apply to the following rule:

If this commit is applied it will ... fix XOR usage ...

Fixed is imho not correct ;-)

@SG-Noxoreos
Copy link
Contributor

Short question, why do you use the past form? Git recommends using imperative form...

Because the automated changelog build script uses this text as well as the labels to format the changelog entry.
Commit messages are not the same as the pull request title.

@DanielRuf
Copy link
Contributor Author

Ah ok, thanks for the clarification =)

@DanielRuf
Copy link
Contributor Author

Might be useful to document this in CONTRIBUTING.md.

@SG-Noxoreos SG-Noxoreos merged commit 28d60e3 into shopgate:v6.8.0 Aug 12, 2019
@DanielRuf DanielRuf deleted the fix/use-correct-xor-syntax branch August 12, 2019 10:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants