On Wed, 11 Mar 2009, Johannes Schindelin wrote:
Hi,
On Wed, 11 Mar 2009, david@xxxxxxx wrote:
there are two types of helpers that can be written
1. a low-level part that does the simple merges automaticaly and leaves
behind appropriate conflict markers when it can't
[...]
2. after a conflict has taken place, a helper to work with the user to
resolve the conflict
I thought that from my description on the wiki it was obvious that both
are needed.
first off, I'll admit that I am just going by what's been posted here, I
haven't gone looking on the wiki.
secondly, I somewhat disagree with you. #1 is needed for any new formats
that are goning to be handled, but #2 may not be.
take the case of OO documents, you may not need to write a conflict
resolver helper. the 'appropriate conflict markers' may be something that
shows up in your normal OO document editor similar to how the ====> shows
up in a text editor for text conflicts
David Lang
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
