Skip to content

Navigation Menu

Explore
By company size
By use case
By industry
View all solutions
Topics
- AI
- DevOps
- Security
- Software Development
- View all
Explore
- GitHub Sponsors
  Fund open source developers
- The ReadME Project
  GitHub community articles
Repositories
- Enterprise platform
  AI-powered developer platform
Available add-ons
Pricing

Search code, repositories, users, issues, pull requests...

Search

Clear

Search syntax tips

Provide feedback

We read every piece of feedback, and take your input very seriously.

Include my email address so I can be contacted

Saved searches

Use saved searches to filter your results more quickly

Name

Query

To see all available qualifiers, see our documentation.

You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session. You switched accounts on another tab or window. Reload to refresh your session.

Dismiss alert

jj-vcs / jj Public

Notifications You must be signed in to change notification settings
Fork 343
Star 9.8k

Code
Issues 377
Pull requests 120
Discussions
Actions
Projects 1
Wiki
Security
Insights

Additional navigation options

Code
Issues
Pull requests
Discussions
Actions
Projects
Wiki
Security
Insights

conflicts: escape conflict markers by making them longer#4969

Open

scott2000 wants to merge 3 commits intojj-vcs:mainjj-vcs/jj:mainfrom scott2000:escape-conflict-markersscott2000/jj:escape-conflict-markersCopy head branch name to clipboard

+1,093-201

Conversation Commits3 (3)Checks Files changed

Commits

Commits on Dec 17, 2024

conflicts: refactor conflict marker writing and parsing
scott2000
committed
conflicts: escape conflict markers by making them longer
scott2000
committed
local_working_copy: store materialized conflict marker length
scott2000
committed

Footer

© 2024 GitHub, Inc.

Footer navigation

Terms
Privacy
Security
Status
Docs
Contact

You can’t perform that action at this time.