[meta] Add a script for resolving Dropbox conflicts

pull/28/head
Alpha Chen 9 years ago
parent 55adc2307f
commit 4756831013

@ -0,0 +1,17 @@
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")
Loading…
Cancel
Save