Diff3 merge is broken #14

New issue

Open

opened 2022-05-27 14:17:03 -05:00 by xahon · 4 comments

xahon commented

2022-05-27 14:17:03 -05:00

(Migrated from github.com)

std::string base_code_ = "0";
std::string left_code_ = "100";
std::string right_code_ = "200";

dtl::Diff3<char, std::string> diff3(base_code_, left_code_, right_code_);
diff3.compose();
if (!diff3.merge())
{
    std::cout << "Conflict" << std::endl;
}
else
{
    std::string merged = diff3.getMergedSequence(); // 20 here
}

I expect conflict

``` std::string base_code_ = "0"; std::string left_code_ = "100"; std::string right_code_ = "200"; dtl::Diff3<char, std::string> diff3(base_code_, left_code_, right_code_); diff3.compose(); if (!diff3.merge()) { std::cout << "Conflict" << std::endl; } else { std::string merged = diff3.getMergedSequence(); // 20 here } ``` I expect conflict

Qmlio commented

2023-02-27 00:13:41 -06:00

(Migrated from github.com)

Same here

xahon commented

2023-02-27 04:33:03 -06:00

(Migrated from github.com)

@Qmlio This repo seems kind of abandoned. You can check a library from my repo list, I've ported node library to C++ after I failed to find a working one on github

Qmlio commented

2023-02-27 10:16:18 -06:00

(Migrated from github.com)