mirror of
https://github.com/martinvonz/jj.git
synced 2024-09-11 13:56:29 +03:00
demos: update conflict-resolution demo with recent changes
Conflicts are now preserved in the working copy until their conflict markers are gone (they used to be considered resolved).
This commit is contained in:
parent
2796b5a8e1
commit
bf64f89521
@ -76,8 +76,8 @@ Features:
|
|||||||
This design also lets Jujutsu rebase merge commits correctly (unlike both Git
|
This design also lets Jujutsu rebase merge commits correctly (unlike both Git
|
||||||
and Mercurial).
|
and Mercurial).
|
||||||
|
|
||||||
<a href="https://asciinema.org/a/hZ30l6TxYrEzH4n2f7sEfa9jq" target="_blank">
|
<a href="https://asciinema.org/a/MWQz2nAprRXevQEYtaHScN2tJ" target="_blank">
|
||||||
<img src="https://asciinema.org/a/hZ30l6TxYrEzH4n2f7sEfa9jq.svg" />
|
<img src="https://asciinema.org/a/MWQz2nAprRXevQEYtaHScN2tJ.svg" />
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
* **Automatic rebase**
|
* **Automatic rebase**
|
||||||
|
@ -29,11 +29,12 @@ run_command "jj rebase -d b1"
|
|||||||
run_command ""
|
run_command ""
|
||||||
run_command "# Huh, that seemed to succeed. Let'\''s take a"
|
run_command "# Huh, that seemed to succeed. Let'\''s take a"
|
||||||
run_command "# look at the repo:"
|
run_command "# look at the repo:"
|
||||||
pause 3
|
pause 2
|
||||||
run_command "jj log"
|
run_command "jj log"
|
||||||
pause 5
|
pause 4
|
||||||
|
run_command "jj status"
|
||||||
|
pause 3
|
||||||
run_command "# As you can see, the rebased commit has a"
|
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 "# conflict. The file in the working copy looks"
|
||||||
run_command "# like this:"
|
run_command "# like this:"
|
||||||
run_command "cat README"
|
run_command "cat README"
|
||||||
@ -43,18 +44,7 @@ run_command "# Now we will resolve the conflict:"
|
|||||||
run_command "echo \"Hello earth!\" > README"
|
run_command "echo \"Hello earth!\" > README"
|
||||||
pause 2
|
pause 2
|
||||||
run_command ""
|
run_command ""
|
||||||
run_command "# The diff of the conflict resolution looks"
|
run_command "# The status command no longer reports it:"
|
||||||
run_command "# like this:"
|
run_command "jj status"
|
||||||
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
|
pause 2
|
||||||
run_command ""
|
|
||||||
run_command "# Looks good now:"
|
|
||||||
run_command "jj log"
|
|
||||||
pause 3
|
|
||||||
run_command "jj diff"
|
|
||||||
'
|
'
|
||||||
|
Loading…
Reference in New Issue
Block a user