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

Merging #52

Open

curran opened this issue Jan 25, 2019 · 0 comments

Labels

13

Contributor

curran commented Jan 25, 2019 •

edited

Loading

We've got forking, but what about merging?

It would be useful, for sure, to be able to merge two visualizations.

For visualizing the VizHub content, the tree layout would no longer work.

Also, D3's force directed layout would not yield a proper layout either.

We need to use something like the Sugiyama Method.

Here are some JS libraries that appear to implement the Sugimaya Method or similar:

https://github.com/erikbrinkman/d3-dag (looks like best option at first glance)
- https://beta.observablehq.com/@bumbeishvili/d3-dag-longest-path
https://github.com/dagrejs/dagre
https://github.com/strathausen/dracula

Resolving merge conflicts would be another tricky bit to solve. Related:

https://codemirror.net/demo/merge.html
http://ace-diff.github.io/ace-diff/
Git Merge https://git-scm.com/docs/git-merge
Plain text patch computation https://neil.fraser.name/software/diff_match_patch/demos/patch.html
- Related/compatible https://codemirror.net/mode/diff/index.html
GitLab's UI implementation https://about.gitlab.com/2016/09/06/resolving-merge-conflicts-from-the-gitlab-ui/

Of course there's also GitHub's conflict resolution UI:

curran added the 13 label

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment