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
  • #1902

Closed
Open
Created Aug 02, 2015 by Sven Strickroth@mrtuxOwner

Merge squash message less useful when there are conflicts

By str... on September 05, 2013 18:12 (imported from Google Code)


What steps will reproduce the problem?

  1. Choose a branch to merge from that will produce conflicts
  2. In the merge dialog, select the 'Squash' and 'Message' check boxes
  3. Leave the message as auto-generated and click OK
  4. In the commit dialog, click "Resolve"

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

The commit message says "Conflicts:" followed by the list of files with conflicts. I can't find a way to get it to have the "Squashed commit of the following" message that would appear if there had been no conflicts.

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

TortoiseGit 1.8.5.0 on Windows 8

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