Skip to content
GitLab
  • Menu
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
  • TortoiseGit TortoiseGit
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Locked Files
  • Issues 367
    • Issues 367
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 14
    • Merge requests 14
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
    • Test Cases
  • Deployments
    • Deployments
    • Releases
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Code review
    • Insights
    • Issue
    • Repository
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • TortoiseGitTortoiseGit
  • TortoiseGitTortoiseGit
  • Issues
  • #2010
Closed
Open
Issue created Aug 02, 2015 by Sven Strickroth@mrtuxOwner

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?

  1. Cherry pick commits with conflicts
  2. 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
Assignee
Assign to
Time tracking