Skip to content

Commit

Permalink
stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
ilyagr committed Oct 4, 2023
1 parent ba8f655 commit 8d50c43
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
2 changes: 1 addition & 1 deletion demos/demo_operation_log.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ comment "The repo now looks like this:"
run_command "jj log"
comment "The most recent portion of the operation log
is:"
run_command_allow_broken_pipe "jj op log | head"
run_command_allow_broken_pipe "jj op log --limit 4"

comment "Let's undo that rebase operation:"
rebase_op=$(jj --color=never op log --no-graph -T 'id.short(5)' --limit 1 --at-op @--)
Expand Down
12 changes: 8 additions & 4 deletions demos/demo_resolve_conflicts.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,16 @@ set -euo pipefail
. "$(dirname "$0")"/helpers.sh

new_tmp_dir
jj git clone https://github.com/octocat/Hello-World > /dev/null
cd Hello-World
{
jj git clone https://github.com/octocat/Hello-World
cd Hello-World
jj abandon test
jj branch delete test
} > /dev/null

comment "We are on the master branch of the
octocat/Hello-World repo:"
run_command "jj log -r 'all()'"
run_command "jj log"

comment "Let's make an edit that will conflict
when we rebase it:"
Expand All @@ -29,7 +33,7 @@ run_command "jj rebase -d b1"

comment "That seemed to succeed but we are also told there is now a conflict.
Let's take a look at the repo:"
run_command "jj log -r 'all()'"
run_command "jj log"
run_command "jj status"

comment "Indeed, the rebased commit has a conflict. The conflicted file
Expand Down

0 comments on commit 8d50c43

Please sign in to comment.