I have been using the community fork of Maiao for a little while now, and it is excellent. For anyone who prefers working with stacked diffs, but needs to interact with a more traditional forge such as GitHub, try using Maiao for a bit. It just does the right thing in almost every situation. It’s cut my frustration with GitHub at least in half, if not more.