We developed a magic app, that helps you to keep clean your GitHub repository and rebase branches. Also, it notifies you, if your branch has any conflicts. You can set “auto rebase” and the app will automatically do rebase. https://projectr.io