-
Notifications
You must be signed in to change notification settings - Fork 638
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
Add merge squash action #1267
base: master
Are you sure you want to change the base?
Add merge squash action #1267
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What is the difference in the result between "Squash" and "Merge Squash"? If the outcome is the same, I would be in favor of having the name, color, and icon of the button also be the same. |
done
It is the same if you select the right nodes. But I prefer to have the proposed named in the PR as this is the common wording used to describe this action, see for example the github button : |
So, if I understand correctly, the new "Merge Squash" does the same as the existing "Squash" on the newest (topmost) commit?
|
After thinking more about the UI I also think @Hirse renames suggestions would make sense. Also it might be good to unify the two squash actions even further by using the same color and icon. I have picked the What do you/others think? |
This PR adds the merge squash action to the graph. I'm waiting for your feedback before writing tests :)