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

Editorial Workflow: Merge conflicts should be resolved automatically #208

Closed
cassiozen opened this issue Jan 5, 2017 · 0 comments · Fixed by #212
Closed

Editorial Workflow: Merge conflicts should be resolved automatically #208

cassiozen opened this issue Jan 5, 2017 · 0 comments · Fixed by #212
Assignees
@cassiozen

Comments

@cassiozen
Copy link

We already track all changed files in the metadata so we could resolve the conflicts automatically by overwriting.
@cassiozen cassiozen self-assigned this Jan 5, 2017
cassiozen added a commit that referenced this issue Jan 11, 2017
@cassiozen
Merge conflicts automatically. Closes #208
40901cb
@cassiozen cassiozen mentioned this issue Jan 11, 2017
Merged
cassiozen added a commit that referenced this issue Jan 11, 2017
@cassiozen
Editorial workflow Improvements (#212)
48d8077 
* Merge conflicts automatically. Closes #208
* removed unpublished entry route
All entries (either under editorial workflow or not) go through the same edit route.
This was referenced Mar 13, 2021
Closed
Closed
Closed
Closed
Closed
Merged
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@cassiozen cassiozen

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

Editorial workflow decaporg/decap-cms
1 participant
@cassiozen