Join GitHub today
GitHub is home to over 40 million developers working together to host and review code, manage projects, and build software together.Sign up
conflict-solving: first pass on revision browser #670
This adds the first iteration of a revision browsing tool for
2 times, most recently
Mar 30, 2016
5 times, most recently
Apr 14, 2016
intro blog post including screenshots and video here: https://github.com/robertkowalski/couch-labs/blob/blog/blog/databases-are-not-boring/databases-are-not-boring.md
this is really sweet.
I can’t comment on the code yet, but I just have a tiny feature request (that isn’t blocking for this PR or anything): it’d be nice if the doc-compare view would still show the differences, kinda like GitHub split view:
but yeah, excellent work, thanks so much!
Hey @robertkowalski, running that script doesn't show a conflict for me, see screenshot. Here's the result of the command:
Also - could we make the unselected tab ("Table" | "JSON") look a little different? All grey like that makes it look disabled rather than unselected.