github...

Doesn't the git could squash whenever you merge my branch into your branch?

https://github.blog/2016-04-01-squash-your-commits/

Or I am misunderstand this blog post?

Anyway I would fix everything as your comment first and would look about squashing or recommitting this when there was the last thing to be fixed