4 results
tagged
interactive x
-
To Build a Better Ballot
An interactive guide to alternative voting systems.Mon 12 Dec 2016 08:22:01 PM CET - permalink -- http://ncase.me/ballot/
-
Interactive website to discover the Garden of Earthly Delights from Jheronimus Bosch
The interactive documentary Jheronimus Bosch, the Garden of Earthly Delights provides an in-depth tour though The Garden of Earthly Delights. In a web interface the visitor will be taken on an audio-visual journey, including sound, music, video and images to enrich the storytelling.Wed 10 Feb 2016 11:33:09 PM CET - permalink -- https://tuinderlusten-jheronimusbosch.ntr.nl/en
-
mhagger/git-imerge -- incremental merge and rebase for git
Perform the merge between two branches incrementally. If conflicts are encountered, figure out exactly which pairs of commits conflict, and present the user with one pairwise conflict at a time for resolution.Tue 16 Jul 2013 12:53:59 AM CEST - permalink -
git-imerge has two primary design goals:
- Reduce the pain of resolving merge conflicts to its unavoidable minimum, by finding and presenting the smallest possible conflicts: those between the changes introduced by one commit from each branch.
- Allow a merge to be saved, tested, interrupted, published, and collaborated on while it is in progress.- https://github.com/mhagger/git-imerge