How to clear history and merge commits

[schnek]

First, let's find out how many commits need to be merged.🐐
This command will show you what commits you have added compared to the develop branch:

git cherry -v develop

how many changes

git cherry -v develop | wc -l

I have 2 commits. Now I want to rewrite history from HEAD~2, that is, from what was 2 commits ago. To do this, I do this:

git rebase -i HEAD~2

a text editor opens automatically.

Here's a list of my commits and a big comment on what I can do. From the list of commands, you can see that we can use squash or fixup in order to glue commits. The first comes in handy when you want to change the commit message, and the second when you want to use the commit message of the first. So, to glue all the commits, I do like this:

git push --force

before

after

remember delete cannot be restored

[Appled]

Or you can just do "git rebase -i develop" and it will show all commits that are not on develop branch 😃

Also, to note that after rebase and force push other users cannot pull your new changes if they had cloned your branch. They have to delete their local branch and fetch it again.

[schnek]

if you do not change the commits, then this is also possible^^