Steps:
1. Update branchegit reset --hard origin/features/BRANCHNAME
OR
git pull origin features/BRANCHNAME
2. Rebase
git rebase -i HEAD~N --rebase-mergesgit rebase -i HEAD~2 --rebase-merges
OR
git rebase -i COMMIT-NUMBER --rebase-merges
3. Change pick by s (Squash) except first
4. Comment unwanted comment texts
5. Check rebase and push using --force
Â
Rebase a branch: (Avoid if possible)
Example :git rebase origin/BRANCH-NAMEÂ --rebase-merges
Â
Other commands:
git rebase --continue
git rebase --abort
Comments