Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom

conflict files should use device names #711

Closed
meejah opened this issue Apr 17, 2023 · 0 comments · Fixed by #720
Closed

conflict files should use device names #711

meejah opened this issue Apr 17, 2023 · 0 comments · Fixed by #720
Labels
enhancement New feature or request

Comments

@meejah
Copy link
Collaborator

meejah commented Apr 17, 2023 •
edited
Loading

Conflict files should embed names that match the participant names in the Collective (not Author names as they appear to currently use).
@meejah meejah added the enhancement New feature or request label Apr 17, 2023
@meejah meejah mentioned this issue May 16, 2023
Merged
meejah added a commit that referenced this issue Jun 1, 2023
@meejah
Merge pull request #720 from meejah/711.conflict-naming
f6e5a37 
Name conflicts after participant (not author) #711
# for free to join this conversation on GitHub. Already have an account? # to comment
Assignees
No one assigned
Labels
enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

711.conflict naming meejah/magic-folder
1 participant
@meejah