문제
I'd like to merge my feature
-branch into my develop
-branch, but squash some commits into 1, while pulling in others as-is.
Is there a possibilty to git merge --squash feature
and then to choose which commits from the feature
-branch should be squashed and which taken as-is?
해결책
Nah. You must use interactive rebase in order to do pick, delete, squash etc.
git rebase -i HEAD~4
Will let you decide on the four last commits.
제휴하지 않습니다 StackOverflow