mirror of
https://github.com/martinvonz/jj.git
synced 2024-09-11 13:56:29 +03:00
43 lines
1.0 KiB
Bash
Executable File
43 lines
1.0 KiB
Bash
Executable File
#!/bin/bash
|
|
set -euo pipefail
|
|
. "$(dirname "$0")"/helpers.sh
|
|
|
|
new_tmp_dir
|
|
jj git clone https://github.com/octocat/Hello-World > /dev/null
|
|
cd Hello-World
|
|
|
|
comment "We are on the master branch of the
|
|
octocat/Hello-World repo:"
|
|
run_command "jj log -r 'all()'"
|
|
|
|
comment "Let's make an edit that will conflict
|
|
when we rebase it:"
|
|
run_command "jj describe -m \"README: say which world\""
|
|
run_command "echo \"Hello Earth!\" > README"
|
|
run_command "jj diff"
|
|
|
|
comment "We're going to rebase it onto commit b1.
|
|
That commit looks like this:"
|
|
run_command "jj diff -r b1"
|
|
|
|
comment "Now rebase:"
|
|
run_command "jj rebase -d b1"
|
|
|
|
comment "Huh, that seemed to succeed. Let's take a
|
|
look at the repo:"
|
|
run_command "jj log -r 'all()'"
|
|
run_command "jj status"
|
|
|
|
comment "As you can see, the rebased commit has a
|
|
conflict. The file in the working copy looks
|
|
like this:"
|
|
run_command "cat README"
|
|
|
|
comment "Now we will resolve the conflict:"
|
|
run_command "echo \"Hello earth!\" > README"
|
|
|
|
comment "The status command no longer reports it:"
|
|
run_command "jj status"
|
|
|
|
blank
|