docs: minor updates to description of branch conflicts

Closes #4220.

docs/branches.md

@@ -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