Conflict dialog show local and remote commits
By var... on November 20, 2013 16:25 (imported from Google Code)
What steps will reproduce the problem?
- Cherry pick commits with conflicts
- Dialog for conflict resolution is opened with buttons "Modified", "Delete" and "Abort"
From here I cannot easily decide what to do, because I don't know time of changes.
What is the expected output? What do you see instead?
It will be easier if there is time information about Local and remote changes.
What version of TortoiseGit and msysgit are you using? On
what operating system?
Windows 8 x64, 1.8.6.3
Please provide any additional information below.
To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information