git - Is there a way to squash a commits in already merged pull request? -
consider scenario:
- i working on local feature or defect branch created develop branch.
- then released changes multiple commits remote branch (as happens in pr review process).
- my pr approved team reviewing changes. forgot quash commits on remote , local branch , merged remote branch in develop branch.
- deleted local , remote branch.
now realized merged changes in develop without doing squash.
so there way me squash commits in develop branch after fact commits merged in develop branch ?
option 1: squash commits on remote develop
branch.
option 2: since merged feature-branch
before deleting it, should still have access commits. git revert
on develop
branch commit right before merge commit. checkout last commit did on feature-branch
git checkout <commit reference>
. run git rebase -i
squash commits before merge feature-branch
master
.
Comments
Post a Comment