github-gem
github-gem copied to clipboard
gh merge --squash doesn't squash commits!
Hi!
gh merge --squash doesn't squash, and git merge --squash does.
Steps to reproduce in my case were: I make fork of bmabey/database_cleaner and then:
gh clone stanislaw/database_cleaner
gh pull kristianmandrup/master (contains numerous commits i want to squash into bmabey/master)
gh pull bmabey/master
gh merge --squash kristianmandrup/master
resolve conflicts in couple of files...
gh add -A
gh commit -m "squash commit"
gh log -- shows numerous commits of @kristianmandrup + mine instead of one mine.
If I do the same steps but use
git merge --squash kristianmandrup/master
All works ok - I have one squashed commit.
Thanks, Stanislaw.