[Feat Req] Merge "take all theirs" / "take all mine" - Prevent 100 "take theirs" clicks!

Hey guys --

I wanted to bump up this feature I was wondering about long ago (originally posted in beta forum, so thought I'd post this here):

Similar to Git, allow to "take all theirs" or "take all mine" upon merges. For example, I upgraded a Unity asset store package >> pushed >> and had 100+ merge conflicts. My teammate had to "take theirs" about 120 times (and each of those 120 times asks for confirmation "are you sure?") - so 240 clicks, about 5 seconds each:

That's about 20 minutes of clicking "take theirs".

Please add this feature it's very critical (for the sake of time loss) for silly merges like this.

Thank you!

 

Hi @dylanh7244! Thank you for the feature suggestion! I feel your pain on this one, it's a major pain point and we're actively working on making this process easier.