Resolving a merge conflict in Jujutsu VCS

by chriskrycho 3 months ago

macOS ◆ xterm-256color ◆ fish 165 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

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

by chriskrycho 3 months ago

Rebasing with conflicts in Jujutsu VCS featured 05:08

by chriskrycho 3 months ago

git mv is all lies 00:48

by chriskrycho 9 months ago

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

by chriskrycho 3 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 offer 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 run the following command to create GIF file:

agg https://asciinema.org/a/635481 635481.gif

Or, if you already downloaded the recording file:

agg 635481.cast 635481.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.