Mega-Merge Workflow

by tim-janik 9 days ago

GNU/Linux ◆ xterm-256color ◆ bash 60 views

This screencast demonstrates the Mega-Merge workflow, which allows to combine selected feature branches into a single “Mega-Merge” commit that the working copy is based on. It begins by creating a new commit (Ctrl+N) based on a feature branch and then adds other feature branches as parents to the commit with the parent editor (Alt+P). As part of the workflow, new commits can be squashed (Alt+W) or rebased (Alt+R) into the existing feature branches. To end up with a linear history, the demo then shows how to merge a single branch into master and rebases everything else to complete a work phase.

https://github.com/tim-janik/jj-fzf

More by tim-janik

JJ-FZF Intro 2 01:17

by tim-janik 14 days ago

Splitting Large Changes with JJ-FZF 01:53

by tim-janik 15 days ago

Merging Commits 01:17

by tim-janik 13 days ago

Rebasing Commits 03:16

by tim-janik 13 days 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 685256.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/685256.cast',
      document.getElementById('player'),
      { cols: 132, rows: 40 }
    );
  </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/685256 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.