Introducing git-sqwish, a
git squash without repetitive merge conflicts.
It is intended to alter your workflow; shifting from
git rebase and
git rebase -i to
git merge and
The result is a single merge conflict set to deal with each time you sync rather than 1 set per commit.
More information can be found in the GitHub repository.