When git detects conflicts that it cannot resolve automatically (such as unrelated changes), the merge will not complete automatically
git will display the files that have merge conflicts with conflict markers that demarcate the content and the branch that the content was on. The user can then edit the files and decide on resolving the conflicts, by retaining one or more changes or making other changes altogether.
When done, stage all such files for inclusion (via “git add”) and continue with “git commit”. git knows that a merge was in progress and will provide an appropriate message that you may choose to edit
Share this recording
Link
Append ?t=30 to start the playback at 30s, ?t=3:20 to start the playback at 3m 20s.
Embed image link
Use snippets below to display a screenshot linking to this recording.
Useful in places where scripts are not allowed (e.g. in a project's README file).
HTML:
Markdown:
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:
Paste the above script tag where you want the player to be displayed on your page.
See embedding docs for additional options.
Download this recording
You can download this recording in asciicast v1 format, as a .json file.
DownloadReplay in terminal
You can replay the downloaded recording in your terminal using the
asciinema play
command:
asciinema play 19910.jsonIf 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/19910.json',
document.getElementById('player'),
{ cols: 93, rows: 22 }
);
</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/19910 demo.gifOr, if you already downloaded the recording file:
agg demo.cast demo.gifCheck 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.