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.

[quetzalcoatl]

Wouldn't jj resolve --tool :ours|:theirs do exactly what @scanhex needed?

restore would not do anything because already contains the conflicted version of the file

When you are in a situation when restore -f XXX provides you with a file-with-conflict-markers, then the XXX itself contains that image of the file, and the parent(s) of the XXX will contain the original, pre-conflict versions. If instead of XXX you point to its parent0 (or par1, or ...) you will get original 'ours' (or original 'theirs', or ...) version of the file with no conflict markers.

Hm... but I think I'm talking about merge conflict, not rebase conflict, sorry..
on rebase conflict the 'parents' for ours/theirs would be the same.

But, anyways, if you did in fact get a file in conflicted state, then you should be able to fully pick left/ours or right/theirs version right from that file-with-conflict-markers:

    jj rebase .......                                 # lets say it results in conflict, and commit "xyz" has conflicting changes
    jj new xyz                                        # begin fixing, it already informs us the conflict is in file path/to/the.file.txt
    jj resolve --tool :ours  path/to/the.file.txt     # try resolving with 'left' version of conflict
    jj diff -r @--                                    # check if change to this file looks OK ; "@-" is conflicted rebased XYZ, @-- is its parent, clean, unchanged
    jj undo                                           # lets say we didn't like what we saw, rollback to conflicted state
    jj resolve --tool :theirs path/to/the.file.txt    # try the other side
    jj diff -r @--                                    # and review it
    jj squash                                         # alright, this side was the one we wanted