Changelog
- The squash commits option has been fixed and can be used properly.
- Subtree update/addition has been changed to use new commands and the subtree updating fixes the merge conflicts and uses the branch that will be merged (
git checkout --theirs). - A few other bugfixes and improvements.