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.

Sign up for GitHub

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

Jump to bottom

Add a way of resolving conflicts involving more than 3 parts #19

Closed
martinvonz opened this issue Jun 3, 2021 · 2 comments
Closed

Add a way of resolving conflicts involving more than 3 parts #19

martinvonz opened this issue Jun 3, 2021 · 2 comments

Comments

@martinvonz
Copy link
Member

No description provided.

@martinvonz
Copy link
Member Author

I plan to add the same kind of conflict markers I added to Mercurial in https://phab.mercurial-scm.org/D9551. However, something else is needed for resolving non-file conflicts (e.g. where one part added a regular file, one part added a symlink, one part added a directory). We will probably want some command for resolving conflicts.

martinvonz added a commit that referenced this issue Jun 30, 2021
@martinvonz
conflicts: use new multi-way diff for materialized multi-way conflicts
4435281 
This copies the conflict marker format I added a while ago to
Mercurial (https://phab.mercurial-scm.org/D9551), except that it uses
`+++++++` instead of `=======` for sections that are pure adds. The
reason I made that change is because we also have support for pure
removes (Mercurial never ends up in that situation because it has
exactly one remove and two adds).

This change resolves part of issue #19.
xxxserxxx pushed a commit to xxxserxxx/jj that referenced this issue Mar 14, 2023
@wildeyedskies
Merge pull request jj-vcs#19 from wildeyedskies/playlist-support
8fe2832 
Playlist support
@martinvonz
Copy link
Member Author

I consider this resolved by commit 4435281. We could have a new issue about resolving non-file conflicts. We could also have another issue for making jj resolve handle more than 3 parts.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@martinvonz