merge with conflicts freeze #941
Description
hi,
when I do a merge between 2 branches without conflicts it works perfectly, but if there are conflicts, it remains stuck with the popup..
I tried all the options but no glue
{{ message }}
hi,
when I do a merge between 2 branches without conflicts it works perfectly, but if there are conflicts, it remains stuck with the popup..
I tried all the options but no glue