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 372
Star 10.4k

Code
Issues 392
Pull requests 122
Discussions
Actions
Projects 1
Wiki
Security
Insights

Additional navigation options

Code
Issues
Pull requests
Discussions
Actions
Projects
Wiki
Security
Insights

resolve: try to resolve all conflicted files in fileset#5111

Merged

scott2000 merged 2 commits intojj-vcs:mainjj-vcs/jj:mainfrom scott2000:resolve-allscott2000/jj:resolve-allCopy head branch name to clipboard

Jan 9, 2025

+426-123

Conversation Commits2 (2)Checks Files changed

Commits

Commits on Jan 8, 2025

merge_tools: extract MergeToolFile struct
scott2000
committed
resolve: try to resolve all conflicted files in fileset
scott2000
committed

Footer

© 2025 GitHub, Inc.

Footer navigation

Terms
Privacy
Security
Status
Docs
Contact

You can’t perform that action at this time.