Comment by aanthracite

Just avoid rebase and --amend and you will be fine.

Your commit log won't be perfect, but also you won't waste your time fixing conflicts and other issues...