Thank you! Can I make one more request? I'd love to be able to see merge conflicts from the diff page (also like BB does).

Knowing the conflict is just db/schema version instead of something more problematic-- that is especially handy when used in conjunction with various target branches.

i.e. I know <another-feature> branch is about to be merged before right before <my-branch> gets merged. Then, I can know what I'm going to have to fix quickly without having to go back to terminal, fetch <another-feature>, merge <my-branch>, just to find the conflicts. Yes, I have to do that with master after it's merged anyways, but I find it great to see quickly and at a glance beforehand.