method skip () =
match current_conflict, remain with
| Some _, ((Conflict cpl) :: q) ->
let s = self#string_of_conflict cpl in
Buffer.add_string resolved s;
let tag = wview_1#buffer#create_tag [`FOREGROUND "DarkGreen"] in
wview_1#buffer#insert ~tags: [tag] s;
remain <- q ;
wview#buffer#set_text "";
current_conflict <- None;
wl_status#set_text
(Odiff_messages.conflicts_to_resolve self#remaining_conflicts);
wb_validate#misc#set_sensitive false ;
wb_skip#misc#set_sensitive false ;
wview#set_editable false ;
self#resolve_next
| _ ->
()