You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Is your feature request related to a problem? Please describe.
I recently rebased a branch and included multiple parents.
Several revisions descended from that merge commit I've got a revision with new conflicts.
When opening the file to resolve conflicts I see Conflict #1 of 3, then Contents of side #1Changes from base to side #2, but I don't actually know which revisions baseside #1 and side #3 correspond to, and can't find anywhere where this information is surfaced.
In fact, I'm not actually sure whether it's always possible to assume these 'sides' correspond to a revision. If they do I'd love to know which revisions they are, or perhaps which revisions were involved in a given conflict.
Describe the solution you'd like
I'm not sure it's possible, but I'd love to see:
<<<<<<< Conflict 1 of 3 between abcd and my-feature-branch
+++++++ Contents of abcd
eval env denv activeThreads ustk bstk (Push ufsz bfsz uasz basz cix comb k) r nw
%%%%%%% Changes from defgh to my-feature-branch
...
>>>>>>> Conflict 1 of 3 ends
Describe alternatives you've considered
Even if jj st showed which files were conflicted because of which revisions that'd help, but would be slightly less helpful.
Thanks y'all! If I'm missing a better way to get this information please let me know!
The text was updated successfully, but these errors were encountered:
This is a duplicate of #1176. The current information stored in conflicted commits don't currently allow us to accurately determine which side corresponds to which original commit, due to the variety of ways conflicted commits can be created (see #1176 (comment) for a more detailed explanation).
Edit: In general, when rebasing commit B onto commit A, the left side (side #1) is the contents from commit B, the base is the contents from the common ancestor of commits A and B, and the right side (side #2) is the contents from commit A. If one of these commits are themselves conflicted, those different conflicted files will be included in the new conflicted commit as additional bases/sides of the conflict.
Is your feature request related to a problem? Please describe.
I recently rebased a branch and included multiple parents.
Several revisions descended from that merge commit I've got a revision with new conflicts.
When opening the file to resolve conflicts I see
Conflict #1 of 3
, thenContents of side #1
Changes from base to side #2
, but I don't actually know which revisionsbase
side #1
andside #3
correspond to, and can't find anywhere where this information is surfaced.In fact, I'm not actually sure whether it's always possible to assume these 'sides' correspond to a revision. If they do I'd love to know which revisions they are, or perhaps which revisions were involved in a given conflict.
Describe the solution you'd like
I'm not sure it's possible, but I'd love to see:
Describe alternatives you've considered
Even if
jj st
showed which files were conflicted because of which revisions that'd help, but would be slightly less helpful.Thanks y'all! If I'm missing a better way to get this information please let me know!
The text was updated successfully, but these errors were encountered: