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.

Sign up for GitHub

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

Jump to bottom

Is there a way to generate a git-merge style single string? #307

Open
hponde opened this issue Dec 23, 2020 · 1 comment
Open

Is there a way to generate a git-merge style single string? #307

hponde opened this issue Dec 23, 2020 · 1 comment
Labels
merge planned-for-next-release question

Comments

@hponde
Copy link

hponde commented Dec 23, 2020

If I have a patch and the original content, is there a way using this library to generate the single string that we see as the output of a git merge with the <<<<<<, ====== and >>>>>> markers?
@ExplodingCabbage
Copy link
Collaborator

Pretty sure the merge code in merge.js is meant to be able to support this, but there are open bug reports about it, it's not documented, and I'm not totally sure how it works. I'll get back to this question once I've addressed other issues about that code and had a proper look at it...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
merge planned-for-next-release question
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@hponde @ExplodingCabbage