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.
Certainly - thanks for that! I've included it here.
We're aiming to monitor this board as much as possible, but if there other feature asks that come up, feel free to connect with our Support team - they're also available to take your feature asks and report them to our Engineering team.
A couple days ago I noticed that the status box on the PR page now includes a list of conflicted files. Not sure if that was in any way related to my request here, but wanted to thank you if it was. That is very helpful.
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.