Question

Sometimes (it happens often) I make mistakes and making a kind of “fast fix” after push.

but for some commit clarity sometimes I’m making re fork (if that was in my fork) and make, commit all changes Again.

Is there someway to merge commits?

Answer 1

Yep, there’s a way, and it is called squashing.

git rebase -i sha1_of_the_first_concerened_commit

Then replace all the edit of the commits below the concerned commit by squash (or s), save the file, and continue rebasing with git rebase --continue.

The next time you’ll push, your push will probably be rejected, you’d need then to git push -f.

---

But in your specific case, there’s no need to go trough this all, you can use commit --amend instead.

Let’s say you commited, then made a quick fix on file1. You’d just need to add your file to the staging area:

git add file1

Then:

git ci --amend

And finally force push:

git push -f

Be careful when rewriting history, it is fine when you’re the only one working on a repo, or you’re sure no one pulled after you, otherwise it’s a pain for the others.