Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Diff3 merge is broken #14

Open
xahon opened this issue May 27, 2022 · 4 comments
Open

Diff3 merge is broken #14

xahon opened this issue May 27, 2022 · 4 comments

Comments

@xahon
Copy link

xahon commented May 27, 2022

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
Copy link

Qmlio commented Feb 27, 2023

Same here

@xahon
Copy link
Author

xahon commented Feb 27, 2023

@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
Copy link

Qmlio commented Feb 27, 2023

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

@Qmlio
Copy link

Qmlio commented Feb 27, 2023

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants