When rebasing and running into a conflict, I don’t get the context of the commit that I’m resolving for. All I see is that there are some conflicts for the next commit, and I can see the shasum of this “next commit”, but I don’t see the commit message in full, and all the details. I think seeing the original commit and what changes it made to its base would help to resolve the conflict.
Show commit messages and details during merge conflicts
UloPe
#2
Yes please!
This is probably the single most annoying thing about SM.
I never know which is which when opening the resolve view (esp. in more complex cases like rebase --onto etc.).
Also showing the branch name (if there’s one) whence the commit came would be very much appreciated .
0 Likes