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

Pragmatic Conflict Resolution V1 #4866

Closed
2 tasks done
mhsdesign opened this issue Jan 31, 2024 · 0 comments
Closed
2 tasks done

Pragmatic Conflict Resolution V1 #4866

mhsdesign opened this issue Jan 31, 2024 · 0 comments
Labels
9.0

Comments

@mhsdesign
Copy link
Member

mhsdesign commented Jan 31, 2024 •
edited
Loading

A primitive ui / cli adapter should have at least those three simple options. More complex operations like cherry-picking might follow once we found a clear concept.

  1. Discard All
  2. Apply all possible and discard rest ?
  3. Set aside, make fresh content stream
@mhsdesign mhsdesign moved this to Prioritized 🔥 in Neos 9.0 Release Board Jan 31, 2024
@mhsdesign mhsdesign added the 9.0 label Jan 31, 2024
@grebaldi grebaldi mentioned this issue Mar 13, 2024
Open
3 tasks
@ahaeslich ahaeslich moved this from Prioritized 🔥 to Under Review 👀 in Neos 9.0 Release Board Mar 14, 2024
@ahaeslich ahaeslich moved this from Under Review 👀 to In Progress 🚧 in Neos 9.0 Release Board Mar 14, 2024
@mficzel mficzel mentioned this issue Mar 15, 2024
Merged
6 tasks
@github-project-automation github-project-automation bot moved this from In Progress 🚧 to Done ✅ in Neos 9.0 Release Board May 22, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
9.0
Projects
Neos 9.0 Release Board
Archived in project
Milestone
No milestone
Development

No branches or pull requests
1 participant
@mhsdesign