Zim

Handle page conflicts

Registered by Jaap Karssenberg on 2014-05-06

When e.g. version control results in a merging conflict, try to resolve automatically by writing a ".conflict" file. In the interface show such conflicts and allow the user to resolve them.

Blueprint information

Status:
Not started
Approver:
None
Priority:
Undefined
Drafter:
Jaap Karssenberg
Direction:
Needs approval
Assignee:
None
Definition:
New
Series goal:
None
Implementation:
Unknown
Milestone target:
None

Related branches

Sprints

Whiteboard

(?)

Work Items

This blueprint contains Public information 
Everyone can see this information.

Subscribers

No subscribers.