export def "conflicts list" [] { fd --hidden --no-ignore sync-conflict $env.HOME | lines | where { |path| not ($path =~ "/Trash/") } } export def "conflicts merge" [] { (conflicts list) | each { |conflict| merge ( to_original $conflict ) $conflict let input = ( input $"Merge successful? \((ansi pb)Y(ansi reset)/n\) \n" ) let sanitize = ( $input | str trim | str substring 0..0 ) if ($sanitize | is-empty) or $sanitize in ['y' 'Y'] { rm --verbose --interactive $conflict } else { $conflict } } } export def "conflicts diff" [] { (conflicts list) | each { |conflict| diff ( to_original $conflict ) $conflict } } def parse-sync-conflict [] { parse -r '(?.*)\.sync-conflict-(?.\d+)-(?