Skip to content

GitLab

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
TortoiseGit
TortoiseGit
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Locked Files
  • Issues 301
    • Issues 301
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
    • Iterations
  • Merge requests 8
    • Merge requests 8
  • Requirements
    • Requirements
    • List
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
    • Test Cases
  • Analytics
    • Analytics
    • CI/CD
    • Code Review
    • Insights
    • Issue
    • Repository
    • Value Stream
  • Members
    • Members
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • TortoiseGit
  • TortoiseGitTortoiseGit
  • Issues
  • #2728

Closed
Open
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
None
Milestone
None
Assign milestone
Time tracking
None
Due date
None