mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-02-12 07:24:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

docs: minor updates to description of branch conflicts

Browse source 
Closes #4220.
This commit is contained in:
Martin von Zweigbergk 2024-08-05 13:27:31 -07:00 committed by Martin von Zweigbergk
parent d061c3782f
commit 417f19d58a
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
docs/branches.md
View file

@ -206,9 +206,9 @@ in the repo. The local branch more typically becomes conflicted because it was
updated both locally and on a remote.
To resolve a conflicted state in a local branch (e.g. `main`), you can move the
branch to the desired target with `jj branch`. You may want to first either
merge the conflicted targets with `jj merge`, or you may want to rebase one side
on top of the other with `jj rebase`.
branch to the desired target with `jj branch move`. You may want to first either
merge the conflicted targets with `jj new` (e.g. `jj new 'all:main'`), or you may
want to rebase one side on top of the other with `jj rebase`.
To resolve a conflicted state in a remote branch (e.g. `main@origin`), simply
pull from the remote (e.g. `jj git fetch`). The conflict resolution will also