From 18b92f97fe3ac11ee498f5b911f815b33366e670 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 26 May 2013 18:42:50 -0400 Subject: [PATCH] blog for the 1/2 day --- .../assistant/blog/day_275__working_hard_or.mdwn | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 doc/design/assistant/blog/day_275__working_hard_or.mdwn diff --git a/doc/design/assistant/blog/day_275__working_hard_or.mdwn b/doc/design/assistant/blog/day_275__working_hard_or.mdwn new file mode 100644 index 0000000000..b667ba08a1 --- /dev/null +++ b/doc/design/assistant/blog/day_275__working_hard_or.mdwn @@ -0,0 +1,12 @@ +Fuzz tester has found several interesting bugs that I've now fixed. It's +even found a bug in my fixes. Most of the problems the fuzz testing has +found have had to do with direct mode merges, and automatic merge conflict +resoltion. Turns out the second level of automatic merge conflict +resolution (where the changes made to resolve a merge conflict themselves +turn out conflict in a later merge) was buggy, for example. + +So, didn't really work a lot today -- was not intending to work at all +actually -- but have still accomplished a lot. + +(Also, Tobias contributed [[tips/dropboxannex]] .. I'll be curious to see +what the use case for that is, if any!)