Rebasing with conflicts in Jujutsu VCS

by chriskrycho featured
Download
.cast - original recording .txt - plain text version .gif - animated GIF
macOS • xterm-256color • fish 10334 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 that happen when we rebase—including when to resolve them, and the ability to keep working with the repository even when there are conflicts.

More by chriskrycho

Resolving a merge conflict in Jujutsu VCS 3:40

by chriskrycho

jj absorb on top of a merge 2:50

by chriskrycho

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

by chriskrycho

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

by chriskrycho

See all

Share this recording
https://asciinema.org/a/635483
Copied!

Append ?t=30 to start the playback at 30s, ?t=3:20 to start the playback at 3m 20s.

See sharing docs for more link customization options.

Embed as image link

Use snippets below to display a preview image linking to this recording.
Ideal for places where scripts are not allowed, such as project README files.

HTML: 

<a href="https://asciinema.org/a/635483" target="_blank"><img src="https://asciinema.org/a/635483.svg" /></a>
Copied!

Markdown: 

[![asciicast](https://asciinema.org/a/635483.svg)](https://asciinema.org/a/635483)
Copied!

Embed the player

If you're embedding on your own page or on a site which permits script tags, you can use the full player widget:

<script src="https://asciinema.org/a/635483.js" id="asciicast-635483" async="true"></script>
Copied!

Paste the above script tag where you want the player to be displayed on your page.

See embedding docs for more player customization options.

Download this recording

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 635483.cast
Copied!

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="/assets/asciinema-player.css" />
</head>
<body>
  <div id="player"></div>
  <script src="/assets/asciinema-player.min.js"></script>
  <script>
    AsciinemaPlayer.create(
      '/assets/635483.cast',
      document.getElementById('player'),
      { cols: 90, rows: 30 }
    );
  </script>
</body>
</html>

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

Generate GIF from this recording

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/635483 demo.gif
Copied!

Or, if you already downloaded the recording file:

agg demo.cast demo.gif
Copied!

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.