Ok, here is another piece of the three way merging puzzle. The gzip3
function can do three
way merging when there are no conflicts that need to be resolved manually.
When there are
such conflicts we need a user interface which displays the common ancestor,
the two alternative
edits, and provides
On Sat, Aug 8, 2009 at 4:05 PM, David Fox dds...@gmail.com wrote:
Ok, here is another piece of the three way merging puzzle. The gzip3
function can do three
way merging when there are no conflicts that need to be resolved manually.
When there are
such conflicts we need a user interface
I definitely think these functions should be added to syb. I certainly
could not have written them myself without hours, perhaps days, of study.
2009/6/2 José Pedro Magalhães j...@cs.uu.nl
Hello,
Would there be interest in having this function added to the SYB library?
Thanks,
Pedro
On
Wait, its much funnier than that. It wouldn't merge the three revisions
because they always differed in one field - the revision number!
On Tue, Jun 2, 2009 at 4:57 PM, David Fox dds...@gmail.com wrote:
On Tue, Jun 2, 2009 at 1:13 PM, David Fox dds...@gmail.com wrote:
On Mon, Jun 1, 2009
Hello,
Would there be interest in having this function added to the SYB library?
Thanks,
Pedro
On Tue, Jun 2, 2009 at 00:40, Ralf Laemmel rlaem...@gmail.com wrote:
Thank you! What I have in mind is three way merging - you have two
revisions based on the same original value, and you need
On Mon, Jun 1, 2009 at 3:40 PM, Ralf Laemmel rlaem...@gmail.com wrote:
Thank you! What I have in mind is three way merging - you have two
revisions based on the same original value, and you need to decide
whether
they can be merged automatically or they need to be merged by a user.
You
On Tue, Jun 2, 2009 at 1:13 PM, David Fox dds...@gmail.com wrote:
On Mon, Jun 1, 2009 at 3:40 PM, Ralf Laemmel rlaem...@gmail.com wrote:
Thank you! What I have in mind is three way merging - you have two
revisions based on the same original value, and you need to decide
whether
they can
Is there a Scrap Your Boilerplate guru out there who could whip up a three
argument version of gzip for me?
___
Haskell mailing list
Haskell@haskell.org
http://www.haskell.org/mailman/listinfo/haskell
On Mon, Jun 1, 2009 at 8:20 PM, David Fox da...@seereason.com wrote:
Is there a Scrap Your Boilerplate guru out there who could whip up a three
argument version of gzip for me?
This can be done of course (untested but type-checked code follows).
Left wondering what the scenario might be :-)
Thank you! What I have in mind is three way merging - you have two
revisions based on the same original value, and you need to decide whether
they can be merged automatically or they need to be merged by a user. You
only have a real conflict when both revisions differ from the original and
On Mon, Jun 1, 2009 at 3:40 PM, Ralf Laemmel rlaem...@gmail.com wrote:
Thank you! What I have in mind is three way merging - you have two
revisions based on the same original value, and you need to decide
whether
they can be merged automatically or they need to be merged by a user.
You
11 matches
Mail list logo
