mirror of
https://github.com/martinvonz/jj.git
synced 2024-09-11 13:56:29 +03:00
61 lines
1.6 KiB
Bash
Executable File
61 lines
1.6 KiB
Bash
Executable File
#!/bin/bash
|
|
set -euo pipefail
|
|
. "$(dirname "$0")"/demo_helpers.sh
|
|
parse_args "$@"
|
|
|
|
new_tmp_dir
|
|
jj git clone https://github.com/octocat/Hello-World
|
|
cd Hello-World
|
|
|
|
run_demo 'Basic conflict resolution flow' '
|
|
run_command "# We are on the master branch of the"
|
|
run_command "# octocat/Hello-World repo:"
|
|
run_command "jj log"
|
|
pause 7
|
|
run_command "# Let'\''s make an edit that will conflict"
|
|
run_command "# when we rebase it:"
|
|
run_command "jj describe -m \"README: say which world\""
|
|
run_command "echo \"Hello Earth!\" > README"
|
|
run_command "jj diff"
|
|
pause 2
|
|
run_command ""
|
|
run_command "# We'\''re going to rebase it onto commit b1."
|
|
run_command "# That commit looks like this:"
|
|
run_command "jj diff -r b1"
|
|
pause 2
|
|
run_command ""
|
|
run_command "# Now rebase:"
|
|
run_command "jj rebase -d b1"
|
|
run_command ""
|
|
run_command "# Huh, that seemed to succeed. Let'\''s take a"
|
|
run_command "# look at the repo:"
|
|
pause 3
|
|
run_command "jj log"
|
|
pause 5
|
|
run_command "# As you can see, the rebased commit has a"
|
|
run_command "# conflict. The working copy is on top of the"
|
|
run_command "# conflict. The file in the working copy looks"
|
|
run_command "# like this:"
|
|
run_command "cat README"
|
|
pause 5
|
|
run_command ""
|
|
run_command "# Now we will resolve the conflict:"
|
|
run_command "echo \"Hello earth!\" > README"
|
|
pause 2
|
|
run_command ""
|
|
run_command "# The diff of the conflict resolution looks"
|
|
run_command "# like this:"
|
|
run_command "jj diff"
|
|
pause 5
|
|
run_command ""
|
|
run_command "# We now squash the conflict resolution into"
|
|
run_command "# the conflicted parent change:"
|
|
run_command "jj squash"
|
|
pause 2
|
|
run_command ""
|
|
run_command "# Looks good now:"
|
|
run_command "jj log"
|
|
pause 3
|
|
run_command "jj diff"
|
|
'
|