Code style wise this can't really pass for now. You added a new file that is tab-indented (conflict_dialog.vala). (and I realize you did it to keep consistency with existing files in the project, but new code should *usually* be good code).
Also diff lines 727-735 you mixed tabs and spaces.
I can't yet review the code itself, give me a couple of days. I'll test it in the meanwhile too.
Code style wise this can't really pass for now. You added a new file that is tab-indented (conflict_ dialog. vala). (and I realize you did it to keep consistency with existing files in the project, but new code should *usually* be good code).
Also diff lines 727-735 you mixed tabs and spaces.
I can't yet review the code itself, give me a couple of days. I'll test it in the meanwhile too.