You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
18 lines
391 B
18 lines
391 B
9 years ago
|
require 'fileutils'
|
||
|
|
include FileUtils
|
||
|
|
|
||
|
|
conflicts = `find ~/Dropbox -name "*conflicted*"`.split("\n")
|
||
|
|
same, diff = conflicts.select { |conflict|
|
||
|
|
actual = conflict.sub(/ \(.*'s conflicted copy \d{4}-\d{2}-\d{2}\)/, '')
|
||
|
|
diff = `diff "#{actual}" "#{conflict}"`
|
||
|
|
diff.empty?
|
||
|
|
}
|
||
|
|
|
||
|
|
same.each do |conflict|
|
||
|
|
rm conflict
|
||
|
|
end
|
||
|
|
|
||
|
|
puts diff.map { |conflict|
|
||
|
|
[conflict, diff].join("\n")
|
||
|
|
}.join("\n")
|