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

[WIP] Diff editor #16

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

[WIP] Diff editor #16

wants to merge 1 commit into from

Conversation

freefony
Copy link
Collaborator

@freefony freefony commented Sep 28, 2018 •
edited
Loading

  • Setup routing: a clickable conflicting rev on doc view routes to diff editor
  • Diff Editor shows winning revision on the left and conflicting revision on the right
  • Diff editor highlights differences, green for winning revision, blue for conflicting revision

Follow Ups

  • Action buttons to select winning revisions
  • Update doc with winning revision

@freefony freefony changed the title Diff editor [WIP] Diff editor Sep 28, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@freefony