diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-05-26 18:42:50 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-05-26 18:42:50 -0400 |
| commit | 030d9eb3f89ab397f93ab7b10bec2526d86ce4ef (patch) | |
| tree | 1362d1ee5d859e0c868e64b5b45a36f5b908d477 | |
| parent | 52ec7a96752c5aa03749ff945a00371f7a7d22c2 (diff) | |
blog for the 1/2 day
| -rw-r--r-- | doc/design/assistant/blog/day_275__working_hard_or.mdwn | 12 |
1 files changed, 12 insertions, 0 deletions
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 000000000..b667ba08a --- /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!) |