cubicdaiya / dtl

diff template library written by C++
Other
283 stars 51 forks source link

Diff3 merge is broken #14

Open xahon opened 2 years ago

xahon commented 2 years ago
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 1 year ago

Same here

xahon commented 1 year ago

@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 1 year ago

Oh thanks......where can I find your repo

Qmlio commented 1 year ago

Yup...I have seen it...let me try it out