On Sunday 10 June 2007, Johannes Schindelin wrote:
I'm not sure what kind of notes you're talking about here. If you're talking
about my git-note concept, I designed notes to be immutable (thus not
amendable) and there is therefore _no_ merging or potential for conflicts
between notes. The only resolution needed is to figure out which order the
notes for a given object should be presented. The default here is
chronological sorting.
...Johan
--
Johan Herland, <johan@herland.net>
www.herland.net
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html