Add Resolve: entries to the context menu.
Implement ours-then-theirs and theirs-then-ours.
Detach instead of hide to discard DOM elements.

(I think.)
GitBridge.checkoutSide to resolve an entire file.

More BufferedProcess kludges, hooray!
Resolve entire files via context menu.
Refactor to save some duplication.
Fill up the progress bar when you resolve.
Reset EditorViews if someone else resolves them.

Like the new context menu items, for example.
Only reset the file if someone else resolved all.
Merge pull request #16 from smashwilson/menu-tastic

Context Menus