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

tutorial: fix conflict formatting issue #4973

Merged
merged 1 commit into from
Nov 25, 2024

Conversation

scott2000
Copy link
Contributor

Fixes formatting issue from #4872. The current formatting is likely due to creating the files without a newline at the end of the file, which would result in the materialization issue described in #3968. Since the tutorial uses echo, which adds a newline automatically, this shouldn't be the output that users see when following the tutorial.

@scott2000 scott2000 merged commit ea72a4a into jj-vcs:main Nov 25, 2024
18 checks passed
@scott2000 scott2000 deleted the fix-tutorial-formatting branch November 25, 2024 22:48
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

Successfully merging this pull request may close these issues.

2 participants