When in a conflict state, how can I show the original patch? #434
Unanswered
aczapszys-apex
asked this question in
Q&A
Replies: 0 comments
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
-
When I
stg rebase $branch
orstg push
and I get conflicts, how can I see what the original diff looked like for the current patch?Is there an equivalent of
git rebase --show-current-patch
or similar?Beta Was this translation helpful? Give feedback.
All reactions