Conflict resolution of rebasing of commits that contain submodule changes
By var... on October 27, 2014 17:26 (imported from Google Code)
What steps will reproduce the problem?
- Rebase such commit (see title)
- Click on conflicted commit (see the attached picture)
- Choose to Edit conflicts
You end with a modal dialog with non-selectable SHA hashes. So from here is it very hard to see which of those hashes to what commit they point to. I have to write them by hand to check.
What is the expected output? What do you see instead?
- If it is possible those hashes to be selectable.
1.1. Even better will be if they are links to a "Git log" dialog in the submodule to see what are they exacly. - Near each of those SHA1s to see commit date and Git log. But if you have links to Git log - this will be more useless.
What version of TortoiseGit and msysgit are you using? On
what operating system?
1.8.11 on Windows 8.1 x64
Please provide any additional information below.
