I noticed that terminal colors are being removed by the Python script. I did spend a little time trying to figure out how to pass along terminal colors, but wasn't successful. Let me know if I need to spend more time figuring that out.

As an example, here's what it looks like with the bash script:

Here's what the same output looks like with the Python script:

I tried using the encoding parameter (setting it to encoding='utf-8', but that didn't work.

I think I need a little help squashing my commits in this pull request. Because in commit e38fc1c816a1e83b943cad2ffc953be5b2cd1fb6 I merged in from master, I'm now getting some merge conflicts while I squash.

Here's what I'm doing:

• From HEAD, my first commit is 59 commits ago: git rev-list 24ac00b042a3f0343be95d283d90eb5d6579b629..HEAD | wc -l
• I do git rebase -i HEAD~59 and change all the picks (except the first one) to squash.
• Then I :wq (vim) and git begins rebasing.

About halfway thru I get a bunch of merge conflicts. Any help is appreciated. Thanks.

untested:

git checkout your_branch
git fetch origin bd616bc16a3a7f70f60ca5034b5a91e5ac89ac9d  # fetch current master
git merge        bd616bc16a3a7f70f60ca5034b5a91e5ac89ac9d  # merge current master
git reset --soft bd616bc16a3a7f70f60ca5034b5a91e5ac89ac9d  # pretend all changes happened on current master
git commit -m "your commit message"  # commit the changes
git push origin your_branch -f  # Force push

Maybe we should mention those steps as well in the doc?

Maybe we should mention those steps as well in the doc?

We could. Though only as a last-ditch option if you've ended up with a mess of merge commits. git rebase -i is way more flexible and something people need to be comfortable with to contribute to this project.

I believe I have finished squashing the commits. I will keep learning and practice git rebase. I do admit to be a bit of a novice at that git command. Thank you for the help.