Accept theirs/ours version of a file when resolving conflicts

[scanhex]

Hi!
Is there any good way to accept our version of a file when fixing conflicts after rebasing from upstream (i.e., after jj rebase -s <feature-change> -d <upstream-change>)?

When I want to accept the upstream changes I would do jj restore <file> --from <upstream-change>, but jj restore <file> --from <feature-change> would not do anything because already contains the conflicted version of the file. I guess one way is to copy the old commit for feature-change before starting the rebase, but is there a more ergonomic way?

[martinvonz]

We don't have that yet. We talked about this on Discord recently. #5307 came out of that discussion.