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

docs: explain long conflict markers #5190

Merged

scott2000 merged 1 commit into jj-vcs:main from scott2000:long-conflict-marker-docs

Dec 26, 2024

Contributor

scott2000 commented Dec 25, 2024

I think this would be good to explain so that users aren't confused if they see this.

Checklist

If applicable:

I have updated CHANGELOG.md
I have updated the documentation (README.md, docs/, demos/)
I have updated the config schema (cli/src/config-schema.json)
I have added tests to cover my changes


          docs: explain long conflict markers

539880e

yuja approved these changes

View reviewed changes

scott2000 merged commit 0dbcdf7 into jj-vcs:main

18 checks passed

scott2000 deleted the long-conflict-marker-docs branch

December 26, 2024 02:34

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet