vim-gita : Gita chaperone (solve conflict)

by lambdalisue 8 years ago

GNU/Linux ◆ xterm-256color ◆ zsh 2243 views

Quick usage of :Gita chaperone of vim-gita to solve conflict

Use chaperone action or hit !! on a conflicted file
dol, dor in WORKTREE to obtain a diff chunk from OURS (:2, left) or THEIRS (:3, right)
dp in OURS or THEIRS to put a diff chunk to WORKTREE
:w to save the changes and perform stage and commit

Note: The version used for the cast is old and it actually open ANCESTOR (:1) and OURS (:2) but OURS (:2) and THEIRS (:3) is a correct behavior.

More by lambdalisue

vim-gita : Gita diff-ls 00:30

by lambdalisue 8 years ago

vim-gita : Gita patch 01:26

by lambdalisue 8 years ago

vim-replica with ANSI color sequence on Neovim 00:19

by lambdalisue 7 years ago

vim-lista 00:22

by lambdalisue 8 years ago

See all

You can download this recording in asciicast v2 format, as a .cast file.

Download

Replay in terminal

You can replay the downloaded recording in your terminal using the asciinema play command:

asciinema play 41580.cast

If you don't have asciinema CLI installed then see installation instructions.

Use with stand-alone player on your website

Download asciinema player from the releases page (you only need .js and .css file), then use it like this:

<!DOCTYPE html>
<html>
<head>
  <link rel="stylesheet" type="text/css" href="asciinema-player.css" />
</head>
<body>
  <div id="player"></div>
  <script src="asciinema-player.min.js"></script>
  <script>
    AsciinemaPlayer.create(
      '/assets/41580.cast',
      document.getElementById('player'),
      { cols: 153, rows: 51 }
    );
  </script>
</body>
</html>

See asciinema player quick-start guide for full usage instructions.

While this site doesn't provide GIF conversion at the moment, you can still do it yourself with the help of asciinema GIF generator utility - agg.

Once you have it installed, generate a GIF with the following command:

agg https://asciinema.org/a/41580 demo.gif

Or, if you already downloaded the recording file:

agg demo.cast demo.gif

Check agg --help for all available options. You can change font family and size, select color theme, adjust speed and more.

See agg manual for full usage instructions.