aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortschwinge <tschwinge@web>2010-06-09 13:47:35 +0000
committerJoey Hess <joey@finch.kitenet.net>2010-06-09 13:47:35 +0000
commit4eb82e7d4161114c6a2194f8f887629ab86162c8 (patch)
tree2f564fd20a3cece7271aaa50fea8e6e46dd52fcb
parent651acf8b1490ebdfe15c11fde3792c13fb118f31 (diff)
downloadikiwiki-4eb82e7d4161114c6a2194f8f887629ab86162c8.tar
ikiwiki-4eb82e7d4161114c6a2194f8f887629ab86162c8.tar.gz
Comment and done.
-rw-r--r--doc/bugs/Git:_changed_behavior_w.r.t._timestamps.mdwn16
1 files changed, 16 insertions, 0 deletions
diff --git a/doc/bugs/Git:_changed_behavior_w.r.t._timestamps.mdwn b/doc/bugs/Git:_changed_behavior_w.r.t._timestamps.mdwn
index 6abe203a3..4ce7cc3df 100644
--- a/doc/bugs/Git:_changed_behavior_w.r.t._timestamps.mdwn
+++ b/doc/bugs/Git:_changed_behavior_w.r.t._timestamps.mdwn
@@ -187,3 +187,19 @@ intentional? Otherwise I could supply a patch.
> merge. As the file is then actually modified to resolve the merge
> I think it makes sense to count the merge as the last modification in
> that case. --[[Joey]]
+
+>> That'd be reasonable, but `git log` will also show merges that are not
+>> conflicting (as in my case).
+
+>> Yet, I'm not totally disagreeing with your choice. With this `git
+>> log` invocation, you're not able to tell from its output whether a
+>> conflict was resolved or not.
+
+>> Also, it's a bit like the *should we use the **author timestamp** or
+>> **commit timestamp*** discussion. Your code will always use the
+>> latest timestamp.
+
+>> I guess I'll get my head wrapped around that, and it's fine, so this is
+>> [[done]].
+
+>> --[[tschwinge]]