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

Improving maintainability: fix ignore revs #198

Conversation

mrauhu
Copy link
Contributor

@mrauhu mrauhu commented Jan 7, 2022

Hello.

Updated a commit id in the .git-blame-ignore-revs file, because commit id was changed after squash merge.

@eirslett, @IanVS

Please, do not use the squash merge method, because it's:

  • breaks commit IDs, as result the .git-blame-ignore-revs file have wrong IDs;
  • breaks ability to merge branches with same commits (on top of each other), so we are need to manually rebase inherit branches after every squash merge.

Best wishes,
Sergey.

@mrauhu mrauhu mentioned this pull request Jan 7, 2022
3 tasks
@joshwooding joshwooding merged commit 1e2f0c2 into storybookjs:main Jan 7, 2022
@joshwooding
Copy link
Member

Thanks @mrauhu

@eirslett
Copy link
Collaborator

eirslett commented Jan 8, 2022

The squash merge was done on purpose. Please respect this decision. Thank you for correcting the .git-blame-ignore-revs file.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants