Skip to content

Navigation Menu

Appearance settings

GitHub Copilot
Write better code with AI

GitHub Spark New
Build and deploy intelligent apps

GitHub Models New
Manage and compare prompts

GitHub Advanced Security
Find and fix vulnerabilities

Actions
Automate any workflow
Codespaces
Instant dev environments

Issues
Plan and track work

Code Review
Manage code changes

Discussions
Collaborate outside of code

Code Search
Find more, search less
Explore

Why GitHub

Documentation

GitHub Skills

Blog
Integrations

GitHub Marketplace

MCP Registry
View all features
By company size

Enterprises

Small and medium teams

Startups

Nonprofits
By use case

App Modernization

DevSecOps

DevOps

CI/CD

View all use cases
By industry

Healthcare

Financial services

Manufacturing

Government

View all industries
View all solutions
Topics

AI

DevOps

Security

Software Development

View all
Explore

Learning Pathways

Events & Webinars

Ebooks & Whitepapers

Customer Stories

Partners

Executive Insights
GitHub Sponsors
Fund open source developers
The ReadME Project
GitHub community articles
Repositories

Topics

Trending

Collections
Enterprise platform
AI-powered developer platform
Available add-ons

GitHub Advanced Security
Enterprise-grade security features

Copilot for business
Enterprise-grade AI features

Premium Support
Enterprise-grade 24/7 support
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.

Appearance settings

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 751
Star 21.4k

Code
Issues 661
Pull requests 227
Discussions
Actions
Projects 1
Wiki
Security
Insights

Additional navigation options

Code
Issues
Pull requests
Discussions
Actions
Projects
Wiki
Security
Insights

conflicts: add labels to conflicts#7692

Draft

scott2000 wants to merge 12 commits intomainjj-vcs/jj:mainfrom

scott2000/conflict-labelsjj-vcs/jj:scott2000/conflict-labelsCopy head branch name to clipboard

Conversation Commits12 (12)Checks Files changed

Draft

conflicts: add labels to conflicts#7692
scott2000 wants to merge 12 commits intomainfrom
scott2000/conflict-labels

Commits

Commits on Oct 23, 2025

lib: add `ConflictLabels` type to store conflict labels
scott2000
committed
merged_tree: add conflict labels to `MergedTree{,Id}`
scott2000
committed
merged_tree: retain conflict labels in `MergedTree::resolve`
scott2000
committed
merged_tree: allow passing labels to `MergedTree::merge`
scott2000
committed
git_backend: store conflict labels in commit header
scott2000
committed
protos: add conflict labels to working copy and simple backend
scott2000
committed
local_working_copy: re-materialize conflicts when labels change
scott2000
committed
conflicts: propagate conflict labels down to materialization functions
scott2000
committed
conflicts: update conflict format to support labels
scott2000
committed
rewrite: add conflict labels when merging commit trees
scott2000
committed
rewrite: add conflict labels for rebased commits
scott2000
committed
rewrite: add conflict labels for squashed commits
scott2000
committed

Footer

© 2025 GitHub, Inc.

Footer navigation

Terms
Privacy
Security
Status
Community
Docs
Contact

You can’t perform that action at this time.