is there a way to somehow warn the user if they're using a merge commit on graphite branches? a couple of my colleagues run into nasty merge conflicts when accidentally mixing merging and rebasing, which has put them off graphite a bit.