Skip to content
GitLab
    • GitLab: the DevOps platform
    • Explore GitLab
    • Install GitLab
    • How GitLab compares
    • Get started
    • GitLab docs
    • GitLab Learn
  • Pricing
  • Talk to an expert
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
    Projects Groups Topics Snippets
  • Register
  • Sign in
  • TortoiseGit TortoiseGit
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributor statistics
    • Graph
    • Compare revisions
    • Locked files
  • Issues 384
    • Issues 384
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 14
    • Merge requests 14
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Artifacts
    • Schedules
    • Test cases
  • Deployments
    • Deployments
    • Releases
  • Packages and registries
    • Packages and registries
    • Model experiments
  • 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
  • #2728
Closed
Open
Issue created Mar 10, 2016 by Alex Verbenko@alex.verbenko

Cherry Pick is not working in case of conflict and empty message.

What steps will reproduce the problem?

  1. Clone a git repository which has some commits with empty messages. (my was imported from svn)
  2. -> Show Log -> Cherry Pick Pick a commit with empty message that would cause a conflicts.
  3. In "Cherry Pick" dialog select "Pick ALL" ( or "Edit ALL" )

Message about conflicts popups. After you solve conflicts there's only "Commit" and "Abort". After you press "Commit" you see a dialog box about an empty commit message BUT YOU CAN NOT "Edit/Split" "Amend" this commit.

What is the expected output? What do you see instead?

Would be much better to have a possibility to edit commit message after resolving the conflicts. Especially if you cherry picked 500+ commits and your only option is to "Abort" the process in the middle.

What version of TortoiseGit and Git are you using? On what operating system?

TortoiseGit 2.0.0.0 (C:\Program Files\TortoiseGit\bin) git version 2.7.0.windows.1 (C:\Program Files\Git\bin; C:\Program Files\Git\mingw64; C:\ProgramData\Git\config)

Windows 7 64bit Professional SP 1

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