Demystifying GitLab Merge Request Resolution

When you resolve a merge conflict quickly in GitLab, you can get a slightly confusing message in your commit history. Here's what's actually going on.

[paulseebach]

There is no button resolve merge request for me

[vesk]

Thanks for the video! Very clear and concise! Exactly what I needed!

[loadmore]

if i merge a -> b, why i cant merge conflict make a -> b, but need b -> a ? i dont want change a only b need update

[pravin]

Thank I was looking for exact same thing