Resolve Merge Conflict option on new Pull Request interface

Question

I just updated my Pull Request interface to it's new iteration, and so far it looks amazing.

One issue I have with it though is that I cannot find the "resolve merge conflict" option that's in the older interface.

Anyone knows if the option's still there/where it is?

Daniil Penkin · Answer

Hello @Cristian Dutrus,

Welcome to the Community!

I'm a bit confused with what you mean by resolve merge conflict option in the old UI. As far as I'm aware, the only extra thing shown in the old UI with regards to conflicts was a banner with a link to the document with some recommendations on how to resolve conflicts:

Is this what you referred to? There's indeed to replacement for this in the new UI at the moment.

Otherwise please elaborate on what you actually meant.

Cheers,
Daniil