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 417
Star 11.8k

Code
Issues 443
Pull requests 154
Discussions
Actions
Projects 1
Wiki
Security
Insights

Additional navigation options

Code
Issues
Pull requests
Discussions
Actions
Projects
Wiki
Security
Insights

conflicts: remove use of Regex from conflict marker parsing#4968

Closed

yuja wants to merge 3 commits intojj-vcs:mainjj-vcs/jj:mainfrom yuja:push-qoxqxwxtwrunyuja/jj:push-qoxqxwxtwrunCopy head branch name to clipboard

+68-62

Conversation Commits3 (3)Checks Files changed

Commits

Commits on Nov 25, 2024

conflicts: remove use of Regex from conflict marker parsing
yuja
committed
conflicts: inline boolean is_conflict_marker_line() to caller
yuja
committed
conflicts: omit uninteresting markers from detection
yuja
committed

Footer

© 2025 GitHub, Inc.

Footer navigation

Terms
Privacy
Security
Status
Docs
Contact

You can’t perform that action at this time.