I want to squash some local commits using rebase -i but I have pulled in and merged other peoples changes in between my local commits. Is it still possible to use this command?
Share
Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
I want to squash some local commits using rebase -i but I have pulled in and merged other peoples changes in between my local commits. Is it still possible to use this command?
I believe it got support for rebasing merges some time ago, so try it.
But even if it didn’t, you can always create new branch from after changes you merged in and use
git cherry-pickto apply your changes there and than tweak them with rebase.For the future, use
git pull --rebaseorgit fetchfollowed bygit rebase(-i) instead of plain pull to your private working branches, so your changes end up rebased on top of what you pull instead of mixed in with merges.