At our company we use pull --rebase as default to avoid local merges when updating our dev branches. This usually works well.

But if while rebasing the local commits a conflict happens, this leads to an visually unclear state. We can solve the conflict, but then it's not evident that a  git rebase --continue is needed to properly complete the pull!

People sometimes continue on working on their code, not realising that they are still in the middle of the pull, and mess up their working copy.

It would help a lot if the Pull button would indicate that the pull/rebase is not completed yet. Maybe it could change the text into "Continue Rebase"... Or display a warning / hint when conflicts are solved during a rebase.

Thank you.