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 364
    • Issues 364
    • 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
  • #2330
Closed
Open
Created Aug 02, 2015 by Sven Strickroth@mrtuxOwner

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?

  1. Rebase such commit (see title)
  2. Click on conflicted commit (see the attached picture)
  3. 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?

  1. 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.
  2. 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.


rebasesubmodule.png

To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information
Assignee
Assign to
Time tracking