When I cut off the branch and went to
git merge --squash<branch name>, I got an error
You cannot combine --squash with --no-ff..
I think I understand the difference between
--no-ff, but when I searched for this error statement, I couldn't find a specific solution.
Please teach me.git
I checked the
gitconfig configuration and found that
ff=false in the
This response was posted as a community wiki based on @Shioji Ryohei's comment.
© 2023 OneMinuteCode. All rights reserved.