Resolving a merge conflict in Jujutsu VCS

by chriskrycho 10 months ago

macOS ◆ xterm-256color ◆ fish 541 views

Unlike in Git or other, older, version control systems, Jujutsu treats conflicts as a first-class concept. This gives us more options when working with conflicts resulting from a merge—including when to resolve them, and the ability to keep working with the repository even when there are conflicts.

More by chriskrycho

git mv is all lies 00:48

by chriskrycho 1 year ago

Using the `new` and `describe` commands in the Jujutsu VCS 04:18

by chriskrycho 10 months ago

demo of Jujutsu's `move` command 01:32

by chriskrycho 10 months ago

Work with an existing Git repo with Jujutsu VCS 01:00

by chriskrycho 10 months 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 635481.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/635481.cast',
      document.getElementById('player'),
      { cols: 90, rows: 30 }
    );
  </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/635481 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.